[josm] 01/07: Imported Upstream version 0.0.svn12271+dfsg

Bas Couwenberg sebastic at debian.org
Mon May 29 05:39:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 93af6ab2ad9a06e5dca651b582b6f3d7f4e3d108
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 29 06:59:46 2017 +0200

    Imported Upstream version 0.0.svn12271+dfsg
---
 .classpath                                         |     4 +-
 README                                             |     3 +-
 REVISION                                           |     8 +-
 build.xml                                          |    24 +-
 data/defaultpresets.xml                            |    58 +-
 data/validator/geometry.mapcss                     |     6 +-
 data/validator/highway.mapcss                      |     3 +-
 data/validator/numeric.mapcss                      |    24 +
 data_nodist/empty.xml                              |     3 -
 eclipse/JOSM (Java 8).launch                       |     2 +-
 i18n/po/af.po                                      |  1034 +-
 i18n/po/am.po                                      |  1034 +-
 i18n/po/ar.po                                      |  1036 +-
 i18n/po/ast.po                                     |   843 +-
 i18n/po/az.po                                      |  1034 +-
 i18n/po/be.po                                      |   850 +-
 i18n/po/bg.po                                      |   856 +-
 i18n/po/bn.po                                      |  1034 +-
 i18n/po/br.po                                      |  1034 +-
 i18n/po/bs.po                                      |  1034 +-
 i18n/po/ca.po                                      |   848 +-
 i18n/po/ca at valencia.po                             |   836 +-
 i18n/po/cs.po                                      |   904 +-
 i18n/po/cy.po                                      |  1034 +-
 i18n/po/da.po                                      |  1344 +-
 i18n/po/de.po                                      |  1072 +-
 i18n/po/de_DE.po                                   |  1034 +-
 i18n/po/el.po                                      |  1038 +-
 i18n/po/en_AU.po                                   |   826 +-
 i18n/po/en_CA.po                                   |  1034 +-
 i18n/po/en_GB.po                                   |   842 +-
 i18n/po/eo.po                                      |  1036 +-
 i18n/po/es.po                                      |   851 +-
 i18n/po/et.po                                      |  1036 +-
 i18n/po/eu.po                                      |  1042 +-
 i18n/po/fa.po                                      |  1034 +-
 i18n/po/fi.po                                      |   828 +-
 i18n/po/fil.po                                     |  1034 +-
 i18n/po/fo.po                                      |  1034 +-
 i18n/po/fr.po                                      |  1066 +-
 i18n/po/ga.po                                      |  1034 +-
 i18n/po/gl.po                                      |  1036 +-
 i18n/po/he.po                                      |  1040 +-
 i18n/po/hi.po                                      |  1034 +-
 i18n/po/hr.po                                      |  1034 +-
 i18n/po/ht.po                                      |  1034 +-
 i18n/po/hu.po                                      |  1451 +-
 i18n/po/hy.po                                      |  1034 +-
 i18n/po/ia.po                                      |  1034 +-
 i18n/po/id.po                                      |   830 +-
 i18n/po/is.po                                      |  1034 +-
 i18n/po/it.po                                      |   923 +-
 i18n/po/ja.po                                      |   931 +-
 i18n/po/ka.po                                      |  1034 +-
 i18n/po/km.po                                      |   838 +-
 i18n/po/ko.po                                      |  1151 +-
 i18n/po/ku.po                                      |  1034 +-
 i18n/po/ky.po                                      |  1034 +-
 i18n/po/lb.po                                      |  1034 +-
 i18n/po/lo.po                                      |  1034 +-
 i18n/po/lt.po                                      |   898 +-
 i18n/po/lv.po                                      |  1034 +-
 i18n/po/mk.po                                      |  1034 +-
 i18n/po/mr.po                                      |  1036 +-
 i18n/po/ms.po                                      |  1034 +-
 i18n/po/nb.po                                      |  1042 +-
 i18n/po/nds.po                                     |  1034 +-
 i18n/po/nl.po                                      |  1151 +-
 i18n/po/nn.po                                      |  1034 +-
 i18n/po/oc.po                                      |  1036 +-
 i18n/po/pa.po                                      |  1034 +-
 i18n/po/pl.po                                      |   915 +-
 i18n/po/pt.po                                      |   842 +-
 i18n/po/pt_BR.po                                   |   876 +-
 i18n/po/rm.po                                      |  1034 +-
 i18n/po/ro.po                                      |  1036 +-
 i18n/po/ru.po                                      |  1170 +-
 i18n/po/sk.po                                      |   877 +-
 i18n/po/sl.po                                      |  1036 +-
 i18n/po/sq.po                                      |  1034 +-
 i18n/po/sr.po                                      |  1034 +-
 i18n/po/sv.po                                      |   816 +-
 i18n/po/ta.po                                      |  1034 +-
 i18n/po/te.po                                      |  1034 +-
 i18n/po/th.po                                      |  1034 +-
 i18n/po/tr.po                                      |  1036 +-
 i18n/po/ug.po                                      |  1034 +-
 i18n/po/uk.po                                      |  1110 +-
 i18n/po/ur.po                                      |  1034 +-
 i18n/po/vi.po                                      |   839 +-
 i18n/po/wae.po                                     |  1034 +-
 i18n/po/zh_CN.po                                   |   826 +-
 i18n/po/zh_TW.po                                   |   828 +-
 images/presets/shop/groceries/cheese.svg           |   235 +
 netbeans/nbproject/project.properties              |    10 +-
 scripts/SyncEditorLayerIndex.groovy                |   124 +-
 scripts/since_xxx.py                               |    33 +
 src/org/openstreetmap/josm/Main.java               |    42 +-
 .../openstreetmap/josm/actions/AddNodeAction.java  |     8 +-
 .../josm/actions/AutoScaleAction.java              |    12 +-
 .../josm/actions/CopyCoordinatesAction.java        |     4 +-
 .../josm/actions/CreateMultipolygonAction.java     |     3 +-
 .../josm/actions/DialogsToggleAction.java          |    11 +-
 .../josm/actions/FollowLineAction.java             |     2 +-
 .../josm/actions/ImageryAdjustAction.java          |    35 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |     5 +-
 src/org/openstreetmap/josm/actions/MoveAction.java |    16 +-
 .../josm/actions/OrthogonalizeAction.java          |     5 +-
 .../josm/actions/ReverseWayAction.java             |    41 +-
 .../actions/SelectNonBranchingWaySequences.java    |     2 +-
 .../josm/actions/ShowStatusReportAction.java       |     8 +-
 .../josm/actions/SimplifyWayAction.java            |     7 +-
 .../openstreetmap/josm/actions/ValidateAction.java |     4 +-
 .../josm/actions/ViewportFollowToggleAction.java   |     3 +-
 .../actions/downloadtasks/DownloadOsmTask.java     |     2 +-
 .../josm/actions/mapmode/DrawAction.java           |    38 +-
 .../josm/actions/mapmode/DrawSnapHelper.java       |     5 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    63 +-
 .../josm/actions/mapmode/SelectAction.java         |   126 +-
 .../josm/actions/upload/ValidateUploadHook.java    |     3 +-
 .../josm/corrector/ReverseWayTagCorrector.java     |     6 +-
 src/org/openstreetmap/josm/data/Bounds.java        |    21 +
 src/org/openstreetmap/josm/data/Preferences.java   |    17 +-
 .../josm/data/SelectionChangedListener.java        |     5 +
 .../openstreetmap/josm/data/coor/CachedLatLon.java |    22 +-
 .../openstreetmap/josm/data/coor/EastNorth.java    |     2 +
 src/org/openstreetmap/josm/data/coor/ILatLon.java  |    66 +
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    24 +-
 .../openstreetmap/josm/data/gpx/GpxConstants.java  |    60 +
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |   342 +-
 src/org/openstreetmap/josm/data/gpx/GpxRoute.java  |     8 +
 src/org/openstreetmap/josm/data/gpx/GpxTrack.java  |    59 +-
 .../josm/data/gpx/ImmutableGpxTrackSegment.java    |     5 +-
 src/org/openstreetmap/josm/data/gpx/WayPoint.java  |    53 +-
 .../data/imagery/GetCapabilitiesParseHelper.java   |     7 +-
 .../josm/data/imagery/ImageryInfo.java             |    12 +-
 .../josm/data/imagery/OffsetBookmark.java          |   198 +-
 .../josm/data/imagery/WMTSTileSource.java          |    54 +-
 .../openstreetmap/josm/data/oauth/OAuthToken.java  |     3 +
 .../josm/data/osm/AbstractPrimitive.java           |    13 +
 src/org/openstreetmap/josm/data/osm/BBox.java      |    37 +-
 .../josm/data/osm/ChangesetCacheEvent.java         |    19 +
 .../josm/data/osm/ChangesetCacheListener.java      |     8 +
 .../josm/data/osm/DataSelectionListener.java       |   301 +
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   514 +-
 .../josm/data/osm/DefaultChangesetCacheEvent.java  |    33 +-
 .../openstreetmap/josm/data/osm/FilterMatcher.java |     3 +-
 src/org/openstreetmap/josm/data/osm/INode.java     |     9 +-
 .../openstreetmap/josm/data/osm/NameFormatter.java |    12 +
 src/org/openstreetmap/josm/data/osm/Node.java      |    45 +-
 src/org/openstreetmap/josm/data/osm/NodeData.java  |    16 +-
 .../josm/data/osm/NodePositionComparator.java      |     4 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |     6 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    63 +-
 .../josm/data/osm/QuadBucketPrimitiveStore.java    |   200 +
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |     4 +-
 .../josm/data/osm/RelationMemberData.java          |     3 +
 .../josm/data/osm/RelationToChildReference.java    |    37 +-
 .../josm/data/osm/SimplePrimitiveId.java           |    14 +
 src/org/openstreetmap/josm/data/osm/Way.java       |     4 +
 src/org/openstreetmap/josm/data/osm/WayData.java   |    11 +
 .../osm/event/AbstractDatasetChangedEvent.java     |    27 +
 .../data/osm/event/ChangesetIdChangedEvent.java    |     3 +
 .../josm/data/osm/event/DataChangedEvent.java      |     3 +
 .../josm/data/osm/event/NodeMovedEvent.java        |     3 +
 .../josm/data/osm/event/PrimitivesAddedEvent.java  |     3 +
 .../data/osm/event/PrimitivesRemovedEvent.java     |     3 +
 .../osm/event/RelationMembersChangedEvent.java     |     3 +
 .../josm/data/osm/event/SelectionEventManager.java |   168 +-
 .../josm/data/osm/event/TagsChangedEvent.java      |     3 +
 .../josm/data/osm/event/WayNodesChangedEvent.java  |     3 +
 .../josm/data/osm/history/HistoryDataSet.java      |    12 +
 .../data/osm/history/HistoryDataSetListener.java   |     4 +
 .../josm/data/osm/visitor/BoundingXYVisitor.java   |    23 +-
 .../data/osm/visitor/paint/ArrowPaintHelper.java   |     9 +
 .../data/osm/visitor/paint/MapRendererFactory.java |    41 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   151 +-
 .../osm/visitor/paint/WireframeMapRenderer.java    |     3 +-
 .../osm/visitor/paint/relations/Multipolygon.java  |    56 +
 .../josm/data/preferences/AbstractProperty.java    |    47 +-
 .../data/preferences/AbstractToStringProperty.java |     6 -
 .../josm/data/preferences/CachingProperty.java     |     2 +-
 .../josm/data/projection/AbstractProjection.java   |    11 +-
 .../josm/data/projection/CustomProjection.java     |     5 +
 .../josm/data/projection/Projecting.java           |    28 +-
 .../josm/data/projection/Projection.java           |    11 +-
 .../josm/data/projection/ShiftedProjecting.java    |     3 +-
 .../josm/data/validation/PaintVisitor.java         |    17 +-
 .../data/validation/routines/DomainValidator.java  |     5 +-
 .../josm/data/validation/tests/LongSegment.java    |    22 +-
 .../josm/data/validation/tests/TagChecker.java     |    31 +-
 src/org/openstreetmap/josm/gui/GettingStarted.java |     6 +
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |     2 +-
 .../openstreetmap/josm/gui/MainApplication.java    |    19 +-
 src/org/openstreetmap/josm/gui/MainFrame.java      |    27 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |    13 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |    26 +-
 src/org/openstreetmap/josm/gui/MapView.java        |    35 +-
 src/org/openstreetmap/josm/gui/MapViewState.java   |    48 +-
 src/org/openstreetmap/josm/gui/MenuScroller.java   |    13 -
 .../josm/gui/NavigatableComponent.java             |    44 +-
 src/org/openstreetmap/josm/gui/ScrollViewport.java |   140 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |     5 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |     3 +-
 .../gui/conflict/pair/AbstractListMergeModel.java  |    24 +-
 .../josm/gui/conflict/pair/AbstractMergePanel.java |   205 +
 .../josm/gui/conflict/pair/ConflictResolver.java   |    15 +-
 .../conflict/pair/properties/PropertiesMerger.java |   397 +-
 .../josm/gui/conflict/pair/tags/TagMerger.java     |   273 +-
 .../josm/gui/datatransfer/OsmTransferHandler.java  |     4 +-
 .../josm/gui/dialogs/ConflictDialog.java           |     1 -
 .../josm/gui/dialogs/ConflictResolutionDialog.java |     2 +-
 .../josm/gui/dialogs/FilterTableModel.java         |     2 +-
 .../josm/gui/dialogs/InspectPrimitiveDataText.java |    10 +-
 .../josm/gui/dialogs/UserListDialog.java           |    32 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |     5 +-
 .../dialogs/relation/GenericRelationEditor.java    |     6 +-
 .../gui/dialogs/relation/actions/SavingAction.java |     2 -
 .../openstreetmap/josm/gui/draw/MapViewPath.java   |    24 +-
 .../josm/gui/history/VersionInfoPanel.java         |    26 +-
 .../josm/gui/io/TagSettingsPanel.java              |     9 +
 .../josm/gui/layer/AbstractMapViewPaintable.java   |    10 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |    21 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |   145 +-
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |    24 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    57 +-
 .../josm/gui/layer/MapViewPaintable.java           |    17 +
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |     1 +
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    82 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |    31 +-
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |    15 +-
 .../gui/layer/gpx/ConvertToDataLayerAction.java    |     2 +-
 .../gui/layer/gpx/DownloadAlongTrackAction.java    |     5 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |   121 +-
 .../layer/gpx/MarkersFromNamedPointsAction.java    |    15 +-
 .../josm/gui/layer/imagery/ColorfulFilter.java     |     2 +-
 .../josm/gui/layer/imagery/ReprojectionTile.java   |     2 +-
 .../layer/imagery/TileSourceDisplaySettings.java   |    50 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |     2 +-
 .../josm/gui/layer/markerlayer/PlayHeadMarker.java |     2 +-
 .../josm/gui/mappaint/MapPaintStyles.java          |    12 +-
 .../openstreetmap/josm/gui/mappaint/StyleKeys.java |     7 +
 .../josm/gui/mappaint/mapcss/CSSColors.java        |     5 +
 .../josm/gui/mappaint/mapcss/ConditionFactory.java |     3 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |     2 +-
 .../josm/gui/mappaint/mapcss/Instruction.java      |    11 +
 .../gui/mappaint/styleelement/LineElement.java     |     4 +-
 .../mappaint/styleelement/RepeatImageElement.java  |     3 +
 .../gui/mappaint/styleelement/StyleElement.java    |    17 +
 .../josm/gui/mappaint/styleelement/TextLabel.java  |     4 +-
 .../placement/CompletelyInsideAreaStrategy.java    |     3 +
 .../placement/PartiallyInsideAreaStrategy.java     |     5 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |    14 -
 .../josm/gui/preferences/ToolbarPreferences.java   |    11 +-
 .../gui/preferences/imagery/ImageryPreference.java |    27 +-
 .../projection/AbstractProjectionChoice.java       |    11 +
 .../projection/CustomProjectionChoice.java         |     7 +
 .../projection/GaussKruegerProjectionChoice.java   |     5 +
 .../LambertCC9ZonesProjectionChoice.java           |     5 +
 .../projection/LambertProjectionChoice.java        |     5 +
 .../projection/PuwgProjectionChoice.java           |     6 +
 .../projection/SwissGridProjectionChoice.java      |     8 +-
 .../projection/UTMFranceDOMProjectionChoice.java   |     5 +
 .../projection/UTMProjectionChoice.java            |     5 +
 .../gui/progress/PleaseWaitProgressMonitor.java    |     5 +
 .../josm/gui/progress/ProgressMonitor.java         |     6 +-
 .../josm/gui/tagging/ac/AutoCompletionManager.java |    50 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |     3 +-
 .../josm/gui/tagging/presets/TaggingPresets.java   |    78 +-
 .../josm/gui/tagging/presets/items/Check.java      |     4 +-
 .../openstreetmap/josm/gui/util/RotationAngle.java |    12 +-
 .../josm/gui/widgets/JosmImageView.java            |     3 +-
 src/org/openstreetmap/josm/io/AbstractReader.java  |     2 +-
 src/org/openstreetmap/josm/io/Capabilities.java    |     7 +-
 .../josm/io/CertificateAmendment.java              |    21 +-
 src/org/openstreetmap/josm/io/FileImporter.java    |     4 +
 src/org/openstreetmap/josm/io/GeoJSONWriter.java   |     2 +-
 src/org/openstreetmap/josm/io/GpxReader.java       |     4 +-
 src/org/openstreetmap/josm/io/GpxWriter.java       |     6 +-
 src/org/openstreetmap/josm/io/NmeaReader.java      |     6 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |    14 +-
 .../josm/io/imagery/ImageryReader.java             |     5 +
 .../josm/io/remotecontrol/DNSName.java             |   252 -
 .../josm/io/remotecontrol/DNSNameFix.java          |   105 +
 .../io/remotecontrol/RemoteControlHttpsServer.java |     2 +-
 .../josm/io/session/ImagerySessionExporter.java    |    23 +-
 .../josm/io/session/ImagerySessionImporter.java    |    37 +-
 .../josm/plugins/PluginInformation.java            |     3 +-
 .../openstreetmap/josm/plugins/PluginProxy.java    |     7 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |    19 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |     4 +-
 .../josm/tools/ListenableWeakReference.java        |    70 +
 .../josm/tools/ListeningCollection.java            |    96 +
 .../openstreetmap/josm/tools/OsmUrlToBounds.java   |     6 +-
 src/org/openstreetmap/josm/tools/PlatformHook.java |   102 +
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |    70 +-
 .../josm/tools/PlatformHookUnixoid.java            |   146 +-
 .../josm/tools/PlatformHookWindows.java            |    79 +-
 src/org/openstreetmap/josm/tools/Utils.java        |   104 +
 src/org/openstreetmap/josm/tools/WinRegistry.java  |   199 +
 .../openstreetmap/josm/tools/XmlObjectParser.java  |     3 +-
 styles/standard/elemstyles.mapcss                  |     5 +
 test/data/empty.osm                                |     3 +
 test/data/regress/14754/malformed_for_14754.osm    |     7 +
 test/data/regress/14788/remove_sign_test_4.osm     |    11 +
 test/data/sessions/bing.jos                        |    22 +-
 test/data/wmts/WMTSCapabilities-GeoAdminCh.xml     | 13458 +++++++++++++++++++
 test/unit/org/openstreetmap/josm/JOSMFixture.java  |    42 +-
 test/unit/org/openstreetmap/josm/MainTest.java     |     2 +-
 test/unit/org/openstreetmap/josm/TestUtils.java    |    44 +-
 .../josm/actions/AlignInLineActionTest.java        |     6 +-
 .../josm/actions/CreateCircleActionTest.java       |    29 +-
 .../actions/downloadtasks/DownloadGpsTaskTest.java |     2 +-
 .../downloadtasks/DownloadNotesTaskTest.java       |     2 +-
 .../actions/downloadtasks/DownloadOsmTaskTest.java |     2 +-
 .../josm/actions/mapmode/DrawActionTest.java       |    11 +
 .../openstreetmap/josm/data/gpx/GpxDataTest.java   |   423 +-
 .../openstreetmap/josm/data/gpx/WayPointTest.java  |     2 +-
 .../imagery/GetCapabilitiesParseHelperTest.java    |    12 +
 .../josm/data/imagery/WMTSTileSourceTest.java      |    21 +-
 .../josm/data/oauth/SignpostAdaptersTest.java      |     2 +-
 .../openstreetmap/josm/data/osm/DataSetTest.java   |    42 +
 .../data/osm/event/SelectionEventManagerTest.java  |   119 +
 .../osm/visitor/paint/StyledMapRendererTest.java   |    79 +
 .../data/projection/ProjectionRegressionTest.java  |     4 +-
 .../data/projection/ShiftedProjectionTest.java     |     5 +-
 .../openstreetmap/josm/gui/MapViewStateTest.java   |     8 -
 .../pair/properties/PropertiesMergerTest.java      |     9 +-
 .../josm/gui/help/HelpBrowserTest.java             |     2 +-
 .../josm/gui/layer/OsmDataLayerTest.java           |     6 +-
 .../josm/gui/layer/gpx/GpxDrawHelperTest.java      |    15 +-
 .../map/TaggingPresetPreferenceTestIT.java         |     9 +-
 .../org/openstreetmap/josm/io/GpxReaderTest.java   |    10 +-
 .../org/openstreetmap/josm/io/OsmReaderTest.java   |   278 +
 .../josm/io/remotecontrol/DNSNameFixTest.java      |    33 +
 .../josm/io/remotecontrol/DNSNameTest.java         |    44 -
 .../josm/io/session/SessionReaderTest.java         |     4 +-
 .../josm/io/session/SessionWriterTest.java         |     6 +-
 .../josm/testutils/JOSMTestRules.java              |    18 +-
 .../josm/tools/ListenableWeakReferenceTest.java    |    55 +
 .../josm/tools/OsmUrlToBoundsTest.java             |     4 +-
 .../org/openstreetmap/josm/tools/UtilsTest.java    |    75 +
 tools/checkstyle/josm_checks.xml                   |     1 -
 tools/checkstyle/josm_filters.xml                  |     2 +-
 tools/pmd/josm-ruleset.xml                         |     1 +
 345 files changed, 89633 insertions(+), 16126 deletions(-)

diff --git a/.classpath b/.classpath
index a91e5c2..c1a3f36 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compr [...]
+	<classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compr [...]
 	<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="src" path="test/functional"/>
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.3.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
diff --git a/README b/README
index 1aa89e4..f6a13d1 100644
--- a/README
+++ b/README
@@ -122,8 +122,7 @@ This is an overview of the files and directories in the JOSM code repository:
     - checkstyle/           libs and config files for checkstyle (automatically detects code style
                             problems in source code); can be launched as an ant target in build.xml
     - commons-cli-1.3.1.jar dependency of Groovy Ant task
-    - error_prone_ant-2.0.19.jar
-                            used to detect code errors during compilation
+    - error_prone_ant.jar   used to detect code errors during compilation
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
     - groovy-all-2.4.11.jar used for some unit tests and various scripts
diff --git a/REVISION b/REVISION
index 20ac468..cd74c6f 100644
--- a/REVISION
+++ b/REVISION
@@ -3,7 +3,7 @@
 <entry
    kind="dir"
    path="trunk"
-   revision="12039">
+   revision="12271">
 <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="12039">
-<author>bastiK</author>
-<date>2017-05-02T21:28:33.757815Z</date>
+   revision="12271">
+<author>Don-vip</author>
+<date>2017-05-28T22:35:21.454382Z</date>
 </commit>
 </entry>
 </info>
diff --git a/build.xml b/build.xml
index 8309765..c06d96e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
         <property name="proj-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
         <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.11.jar"/>
-        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.19.jar"/>
+        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/>
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <!-- build parameter: compression level (ant -Dclevel=N)
                  N ranges from 0 (no compression) to 9 (maximum compression)
@@ -142,6 +142,9 @@ Build-Date: ${build.tstamp}
                 <attribute name="Permissions" value="all-permissions"/>
                 <attribute name="Codebase" value="josm.openstreetmap.de"/>
                 <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
+                <!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
+                <attribute name="Add-Exports" value="java.base/sun.security.util java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi jdk.deploy/com.sun.deploy.config" />
+                <attribute name="Add-Opens" value="java.base/java.lang java.base/jdk.internal.loader java.base/sun.security.x509 java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
             </manifest>
             <zipfileset dir="images" prefix="images"/>
             <zipfileset dir="data" prefix="data"/>
@@ -319,6 +322,7 @@ Build-Date: ${build.tstamp}
             <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
 
@@ -431,13 +435,27 @@ Build-Date: ${build.tstamp}
         <attribute name="coverage" default="true"/>
         <sequential>
             <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
-            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" excludes="jdk.dynalink.*:jdk.nashorn.*">
+            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="org.openstreetmap.josm.*">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
+                    <jvmarg value="--add-modules" if:set="isJava9" />
+                    <jvmarg value="java.se.ee" if:set="isJava9" />
                     <jvmarg value="--add-exports" if:set="isJava9" />
                     <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
-                    <jvmarg value="--add-exports" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
                     <jvmarg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-exports" if:set="isJava9" />
+                    <jvmarg value="jdk.deploy/com.sun.deploy.config=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
+                    <jvmarg value="java.base/java.io=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
+                    <jvmarg value="java.base/java.lang=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
+                    <jvmarg value="java.base/java.text=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
+                    <jvmarg value="java.base/java.util=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-opens" if:set="isJava9" />
+                    <jvmarg value="java.desktop/java.awt=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"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 2341132..7c272a6 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -464,6 +464,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=trunk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=trunk"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=trunk"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=trunk"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=trunk"
@@ -498,6 +499,7 @@
         <item name="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Highway_link"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Highway_link"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Highway_link"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Highway_link" />
             <space />
@@ -527,6 +529,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=primary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=primary"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=primary"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=primary"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=primary"
@@ -569,6 +572,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=secondary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=secondary"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=secondary"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=secondary"
@@ -611,6 +615,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=tertiary"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=tertiary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=tertiary"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=tertiary"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=tertiary"
@@ -652,6 +657,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=unclassified"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=unclassified"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=unclassified"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=unclassified"
@@ -702,6 +708,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:bicycle_road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:bicycle_road"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bicycle_road"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bicycle_road" />
             <space />
@@ -837,6 +844,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=raceway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=raceway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=raceway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=raceway"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=raceway"
@@ -851,6 +859,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=road"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=road"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=road"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=road"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=road"
@@ -870,6 +879,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Key:construction"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:construction"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:construction"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Key:construction"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:construction"
@@ -1065,6 +1075,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=bridleway"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=bridleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bridleway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=bridleway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bridleway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=bridleway"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=bridleway"
@@ -1108,6 +1119,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=cycleway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=cycleway"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=cycleway"
@@ -1503,6 +1515,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=turning_circle"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=turning_circle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=turning_circle"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=turning_circle"
@@ -1810,6 +1823,7 @@
         <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=jersey_barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=jersey_barrier"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:barrier=jersey_barrier"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=jersey_barrier" />
             <key key="barrier" value="jersey_barrier" />
             <combo key="material" text="Material" values="concrete,plastic" />
@@ -1910,7 +1924,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=kissing_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=kissing_gate"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=kissing_gate" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=kissing_gate"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:barrier=kissing_gate" />
             <key key="barrier" value="kissing_gate" />
             <reference ref="barrier_2" />
             <reference ref="optional_maxwidth" />
@@ -2685,6 +2700,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=bus_guideway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=bus_guideway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_guideway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=bus_guideway"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=bus_guideway"
@@ -3152,6 +3168,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=car_repair"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_repair"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=car_repair"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=car_repair"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=car_repair"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=car_repair"
@@ -3877,6 +3894,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=apartment"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=apartment"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=apartment"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=apartment"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=apartment"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=apartment"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=apartment" />
@@ -4220,6 +4238,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=attraction"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=attraction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=attraction"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=attraction"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=attraction"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=attraction"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=attraction"
@@ -4977,6 +4996,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=townhall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=townhall"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=townhall"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=townhall"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=townhall"
@@ -5118,6 +5138,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=kindergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=kindergarten"
                   el.href="http://wiki.openstreetmap.org/wiki/El:Tag:amenity=kindergarten"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=kindergarten"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=kindergarten"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=kindergarten"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=kindergarten"
@@ -6293,7 +6314,8 @@
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
         <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=horse_racing" />
             <space />
             <key key="sport" value="horse_racing" />
             <text key="name" text="Name" />
@@ -6997,6 +7019,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=fountain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=fountain"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=fountain"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fountain"
@@ -7940,6 +7963,17 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Dairy -->
+        <item name="Cheese" icon="presets/shop/groceries/cheese.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=cheese"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=cheese"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=cheese"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=cheese"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cheese" />
+            <space />
+            <key key="shop" value="cheese" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Cheese -->
         <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=deli"
@@ -8015,6 +8049,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=marketplace"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=marketplace"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=marketplace"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=marketplace"
@@ -8097,6 +8132,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=beverages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=beverages"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beverages"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=beverages"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beverages"
@@ -8184,6 +8220,7 @@
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=sports"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=sports"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=sports"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=sports"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=sports"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=sports" />
@@ -8321,6 +8358,7 @@
         <item name="Video Games" icon="presets/shop/video_games.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=video_games"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=video_games"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=video_games" />
             <space />
             <key key="shop" value="video_games" />
@@ -8555,6 +8593,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=books"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=books"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=books"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=books"
@@ -8893,6 +8932,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=toys"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=toys"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=toys"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=toys"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=toys"
@@ -8906,6 +8946,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=gift"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=gift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=gift"
@@ -9130,7 +9171,8 @@
     <item name="Association" icon="presets/office/association.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=association"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=association"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=association" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=association"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=association" />
         <space />
         <key key="office" value="association" />
         <reference ref="name_operator_oh_wheelchair" />
@@ -9189,7 +9231,8 @@
     </item> <!-- Estate agent -->
     <item name="Foundation" icon="presets/office/foundation.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=foundation" />
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=foundation"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=foundation" />
         <space />
         <key key="office" value="foundation" />
         <reference ref="name_brand_operator_oh_wheelchair" />
@@ -9414,6 +9457,7 @@
     <item name="Brewery" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=brewery"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=brewery"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=brewery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:craft=brewery"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=brewery"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:craft=brewery"
@@ -9428,6 +9472,7 @@
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=plumber"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=plumber"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=plumber"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=plumber"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=plumber"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:craft=plumber" />
         <space />
@@ -9832,6 +9877,7 @@
         </item> <!-- Hamlet -->
         <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
+                  ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:place=isolated_dwelling"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=isolated_dwelling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
@@ -9864,6 +9910,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=neighbourhood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:place=neighbourhood"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
@@ -10034,6 +10081,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=island"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:place=island"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=island"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=island"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:place=island"
@@ -10046,6 +10094,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=islet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=islet"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:place=islet"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:place=islet"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=islet" />
@@ -10478,6 +10527,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=village_green"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=village_green"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=village_green"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=village_green"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=village_green"
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 4ae6a91..e7b435d 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -237,12 +237,12 @@ way[waterway] > node.node_in_bridge {
   throwWarning: tr("node connects waterway and bridge");
 }
 
-/* #11128 */
+/* #11128, #14812 */
 way[highway] > node[tourism=information][information=guidepost] {
   set guidepost;
   throwOther: tr("{0} node connected to a highway", "{1.tag}");
 }
-way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal)$/],
+way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge)$/],
 way[highway] > node[building][!entrance],
 way[highway] > node[leisure][!entrance][leisure!=slipway],
 way[highway] > node[office][!entrance],
@@ -319,6 +319,6 @@ way >[index=-1] node {
 way[highway][area!=yes][!tunnel][!covered] > node {
   set node_in_highway;
 }
-way[building] > node.node_in_highway!.first_last_node {
+way[building][building!=no] > node.node_in_highway!.first_last_node {
   throwWarning: tr("node connects highway and building");
 }
\ No newline at end of file
diff --git a/data/validator/highway.mapcss b/data/validator/highway.mapcss
index 557433b..96d31ec 100644
--- a/data/validator/highway.mapcss
+++ b/data/validator/highway.mapcss
@@ -52,12 +52,13 @@ way[highway=unclassified][!name][noname!=yes] {
   assertNoMatch: "way highway=unclassified name=Foo";
 }
 
-way.major_road[!ref][!destination:ref] {
+way.major_road[!ref][!destination:ref][noref!=yes] {
   throwOther: tr("highway without a reference");
   group: tr("missing tag");
   assertMatch: "way highway=primary";
   assertNoMatch: "way highway=primary ref=123";
   assertNoMatch: "way highway=primary destination:ref=123";
+  assertNoMatch: "way highway=primary noref=yes";
 }
 
 way[highway=road] {
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index c1d2ce5..2d5d1d6 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -216,4 +216,28 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node direction=forward";
   assertNoMatch: "node direction=anti-clockwise";
   assertNoMatch: "node direction=anticlockwise"; /* both spellings are in use and even wiki uses both */
+}
+
+/* #14786 (should be safe to just remove the meters unit from the value) */
+*[ele][ele =~ /^-?[0-9]+(\.[0-9]+)? ?m$/] {
+  throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}");
+  fixAdd: concat("ele=", trim(replace(tag("ele"), "m", "")));
+  set .ele_is_fixable;
+  assertMatch: "node ele=12m";
+  assertMatch: "node ele=12 m";
+  assertNoMatch: "node ele=12km";
+  assertMatch: "node ele=12.1m";
+  assertMatch: "node ele=-12.1 m";
+  assertNoMatch: "node ele=12";
+  assertNoMatch: "node ele=high";
+}
+*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_is_fixable{
+  throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}");
+  assertNoMatch: "node ele=12m";
+  assertNoMatch: "node ele=12 m";
+  assertMatch: "node ele=12km";
+  assertNoMatch: "node ele=12.1m";
+  assertNoMatch: "node ele=-12.1 m";
+  assertNoMatch: "node ele=12";
+  assertMatch: "node ele=high";
 }
\ No newline at end of file
diff --git a/data_nodist/empty.xml b/data_nodist/empty.xml
deleted file mode 100644
index 211900a..0000000
--- a/data_nodist/empty.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.3' generator='JOSM'>
-</osm>
diff --git a/eclipse/JOSM (Java 8).launch b/eclipse/JOSM (Java 8).launch
index caf075b..2b399b3 100644
--- a/eclipse/JOSM (Java 8).launch	
+++ b/eclipse/JOSM (Java 8).launch	
@@ -7,7 +7,7 @@
 <listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM&quo [...]
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-DXFImpo [...]
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--debug"/>
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 912294b..789add4 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-10-13 02:39+0000\n"
 "Last-Translator: Grant Slater <Unknown>\n"
 "Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:33+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:34+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: af\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 04d417f..9500392 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2010-03-30 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:35+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: am\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 1a06380..c2aead6 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-10-08 23:09+0000\n"
 "Last-Translator: mourad101ee <mourad101ee at gmail.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:35+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:36+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ar\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5426,6 +5426,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5508,33 +5525,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgid "deleted"
+msgstr "تم حذفه"
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "deleted"
-msgstr "تم حذفه"
-
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5582,12 +5588,6 @@ msgstr "المفتاح"
 msgid "Value"
 msgstr "القيمة"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10160,9 +10160,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11861,7 +11858,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13136,7 +13133,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14253,9 +14255,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14265,9 +14264,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14278,9 +14274,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14863,6 +14867,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14890,6 +14900,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14920,6 +14933,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14968,21 +14984,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15024,15 +15051,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15048,6 +15090,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15153,9 +15201,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15165,6 +15219,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15249,9 +15306,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15267,31 +15351,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15310,13 +15423,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15325,21 +15438,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15358,6 +15481,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15370,6 +15496,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15497,16 +15626,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15539,15 +15673,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15559,15 +15703,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15628,18 +15788,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15703,18 +15882,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15748,26 +15938,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15777,15 +15976,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15793,6 +16006,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15931,23 +16147,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15974,18 +16202,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16019,6 +16263,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16097,12 +16344,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16158,8 +16413,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16183,345 +16438,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23107,6 +23748,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25352,6 +25996,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26324,6 +26971,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27176,6 +27826,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27185,6 +27858,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31722,24 +32398,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 6e0ff9c..9677cbf 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-27 10:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Asturian <ast at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:36+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:37+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ast\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5839,6 +5839,28 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "La so versión ({0} ingresada)"
 msgstr[1] "La so versión ({0} ingresaes)"
 
+msgid "My version (local dataset)"
+msgstr "La mio versión (conxuntu de datos locales)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Propiedaes del mio conxuntu de datos, ye dicir el conxuntu de datos locales"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propiedaes nel elementu fundíu. Van sustituyir a les propiedaes de los mios "
+"elementos cuando s''apliquen les decisiones de fundir."
+
+msgid "Their version (server dataset)"
+msgstr "La so versión (conxuntu de datos locales)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propiedaes nel so conxuntu de datos, esto ye, nel conxuntu de datos del "
+"servidor"
+
 msgid "My with Their"
 msgstr "Mía respectu a la suya"
 
@@ -5927,31 +5949,6 @@ msgstr ""
 "Los nudos fusionaos inda nun tán conxelaos. Nun pué construyise la orde de "
 "resolvimientu."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Propiedaes del mio conxuntu de datos, ye dicir el conxuntu de datos locales"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propiedaes nel elementu fundíu. Van sustituyir a les propiedaes de los mios "
-"elementos cuando s''apliquen les decisiones de fundir."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propiedaes nel so conxuntu de datos, esto ye, nel conxuntu de datos del "
-"servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenaes:"
-
-msgid "Deleted State:"
-msgstr "Estáu borráu:"
-
-msgid "Referenced by:"
-msgstr "Referenciáu por:"
-
 msgid "(none)"
 msgstr "(nada)"
 
@@ -5961,6 +5958,15 @@ msgstr "desaniciáu"
 msgid "not deleted"
 msgstr "non borráu"
 
+msgid "Deleted State:"
+msgstr "Estáu borráu:"
+
+msgid "Coordinates:"
+msgstr "Coordenaes:"
+
+msgid "Referenced by:"
+msgstr "Referenciáu por:"
+
 msgid "Keep my coordinates"
 msgstr "Caltener les mios coordenaes"
 
@@ -6007,12 +6013,6 @@ msgstr "Clave"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "La mio versión (conxuntu de datos locales)"
-
-msgid "Their version (server dataset)"
-msgstr "La so versión (conxuntu de datos locales)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Caltener la pareya clave/valor escoyíu del conxuntu de datos locales"
 
@@ -11082,9 +11082,6 @@ msgstr "Cerrar el diálogu y atayar autorización"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Cerrar el diálogu y aceptar la llave d''Autorización"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Erru al atayar la operación de OAuth executándose"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Llogrando Llave de solicitú OAuth de  ''{0}''"
 
@@ -12961,8 +12958,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Rejilla suiza (Suiza)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (ensin correcciones locales)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadaloupe Fort-Marigot 1949"
@@ -14383,11 +14380,13 @@ msgstr "La llectura foi atayada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Falta atributos obligatorios nel elementu ''bounds''. Los valores actuales "
-"son llonmin=''{0}'',llatmin=''{1}'',llonmax=''{3}'',llatmax=''{4}'', "
-"origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "La vía borrada {0} contien nodos"
@@ -15726,9 +15725,6 @@ msgstr "Abriendo URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "La URL nun contien {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reserváu"
-
 msgid "Outdated Java version"
 msgstr "Versión desactualizada de Java"
 
@@ -15738,9 +15734,6 @@ msgstr "Actualizar Java"
 msgid "You are running version {0} of Java."
 msgstr "Ta executando la versión {0} de Java."
 
-msgid "April 2015"
-msgstr "Abril de 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15754,9 +15747,17 @@ msgstr ""
 "En poco tiempu JOSM va dexar de trabayar con esta versión; encamentámos-y "
 "qu´actualice a Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "¿Deseya actualizar agora?"
 
+msgid "reserved"
+msgstr "reserváu"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16378,6 +16379,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16405,6 +16412,9 @@ msgstr "OpenStreetMap (Estilu Alemán)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Tresporte Públicu (ÖPNV)"
 
@@ -16435,6 +16445,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -16483,21 +16496,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16539,15 +16563,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16563,6 +16602,12 @@ msgstr "Tiris: DOM (Modelu de Superficie)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (propósitu xeneral)"
 
@@ -16668,9 +16713,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16680,6 +16731,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16764,9 +16818,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Xeobase d''Hidrografía"
 
@@ -16782,31 +16863,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -16825,13 +16935,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16840,21 +16950,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -16873,6 +16993,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16885,6 +17008,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Catastru"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -17015,16 +17141,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17057,15 +17188,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17077,15 +17218,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -17146,18 +17303,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17221,18 +17397,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -17266,26 +17453,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17295,15 +17491,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17311,6 +17521,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17449,23 +17662,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17492,18 +17717,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17537,6 +17778,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17615,12 +17859,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17676,8 +17928,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17752,9 +18004,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17806,240 +18069,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24771,6 +25409,9 @@ msgstr "Pescadería o marisquería"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delicatessen"
 
@@ -27047,6 +27688,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation ensin tipu"
 
@@ -28053,6 +28697,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29028,6 +29675,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29037,6 +29707,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33851,24 +34524,6 @@ msgstr "Señal {0}"
 msgid "Additional sign {0}"
 msgstr "Señal Adicional {0}"
 
-msgid "Edit relation"
-msgstr "Editar relación"
-
-msgid "Edit relations"
-msgstr "Editar relaciones"
-
-msgid "No relation is selected"
-msgstr "Non s''escoyó nenguna relación"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Esaniciar nodo ''{0}'' na posición {1} de la relación ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Esaniciar vía ''{0}'' na posición {1} de la relación ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Esaniciar relación ''{0}'' na posición {1} de la relación ''{2}''"
-
 msgid "routing active route"
 msgstr "ruteando itinerariu activu"
 
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 3e58760..f8bfbdb 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-12-17 13:38+0000\n"
 "Last-Translator: iAZISS <iss-sash at mail.ru>\n"
 "Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:37+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:37+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 8f771d8..3d0c563 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-19 15:59+0000\n"
 "Last-Translator: Darafei Praliaskouski <komzpa at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:38+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:38+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: be\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5873,6 +5873,27 @@ msgstr[0] "Іх версія ({0} запіс)"
 msgstr[1] "Іх версія ({0} запісаў)"
 msgstr[2] "Іх версія ({0} запісаў)"
 
+msgid "My version (local dataset)"
+msgstr "Мая версія (лакальны набор дадзеных)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Уласцівасці ў маім наборы дадзеных, гэта значыць лакальным наборы дадзеных"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Параметры ў аб’яднаным элеменце. Параметры ў маіх элементах будуць заменены "
+"пры ўжыванні аб’яднання."
+
+msgid "Their version (server dataset)"
+msgstr "Іх версія (серверны набор дадзеных)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Уласцівасці ў іх наборы дадзеных, гэта значыць серверным наборы дадзеных"
+
 msgid "My with Their"
 msgstr "Маю з іх"
 
@@ -5963,30 +5984,6 @@ msgstr ""
 "Аб’яднаныя пункты яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
 "ліквідацыі канфліктаў."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Уласцівасці ў маім наборы дадзеных, гэта значыць лакальным наборы дадзеных"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Параметры ў аб’яднаным элеменце. Параметры ў маіх элементах будуць заменены "
-"пры ўжыванні аб’яднання."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Уласцівасці ў іх наборы дадзеных, гэта значыць серверным наборы дадзеных"
-
-msgid "Coordinates:"
-msgstr "Каардынаты:"
-
-msgid "Deleted State:"
-msgstr "Выдалены:"
-
-msgid "Referenced by:"
-msgstr "Спасылкі звонку:"
-
 msgid "(none)"
 msgstr "(адсутнічае)"
 
@@ -5996,6 +5993,15 @@ msgstr "выдалены"
 msgid "not deleted"
 msgstr "не выдалены"
 
+msgid "Deleted State:"
+msgstr "Выдалены:"
+
+msgid "Coordinates:"
+msgstr "Каардынаты:"
+
+msgid "Referenced by:"
+msgstr "Спасылкі звонку:"
+
 msgid "Keep my coordinates"
 msgstr "Захоўваць мае каардынаты"
 
@@ -6042,12 +6048,6 @@ msgstr "Ключ"
 msgid "Value"
 msgstr "Значэнне"
 
-msgid "My version (local dataset)"
-msgstr "Мая версія (лакальны набор дадзеных)"
-
-msgid "Their version (server dataset)"
-msgstr "Іх версія (серверны набор дадзеных)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Пакінуць вылучаныя пары ключ/значэнне з лакальнага набору дадзеных"
 
@@ -11188,9 +11188,6 @@ msgstr "Зачыніць дыялог і адмяніць аўтарызацыю
 msgid "Close the dialog and accept the Access Token"
 msgstr "Зачыніць дыялог і прыняць маркер доступу"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Не атрымалася адмяніць выкананую аперацыю OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Атрыманне маркера запыту OAuth ад ''{0}''"
 
@@ -13046,8 +13043,8 @@ msgstr "Зона PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская праекцыя"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (без лакальных карэкцый)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14461,10 +14458,13 @@ msgstr "Чытанне было адменена"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Адсутнічаюць абавязковыя атрыбуты элемента \"межы\". Вызначаны  "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Выдаленая лінія {0} утрымоўвае пункты"
@@ -15857,9 +15857,6 @@ msgstr "Адкрыццё URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL не ўтрымоўвае {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "зарэзервавана"
-
 msgid "Outdated Java version"
 msgstr "Састарэлая версія Java"
 
@@ -15869,9 +15866,6 @@ msgstr "Абнавіць Java"
 msgid "You are running version {0} of Java."
 msgstr "У вас версія Java {0}."
 
-msgid "April 2015"
-msgstr "Красавік 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15886,9 +15880,17 @@ msgstr ""
 "JOSM хутка перастане працаваць з гэтай версіяй. Мы настойліва раім выканаць "
 "абнаўленне да Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Жадаеце выканаць абнаўленне цяпер?"
 
+msgid "reserved"
+msgstr "зарэзервавана"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16522,6 +16524,12 @@ msgstr "HDM (каманда па стварэнні карт гуманітар
 msgid "Mapbox Satellite"
 msgstr "Спадарожнікавыя здымкі Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16549,6 +16557,9 @@ msgstr "OpenStreetMap (нямецкі стыль)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "GPS-трэкі OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Грамадскі транспарт (ÖPNV)"
 
@@ -16579,6 +16590,9 @@ msgstr "Цёплакарта Strava для раварыстаў і бегуно
 msgid "Locator Overlay"
 msgstr "MapBox Locator (аверлэй)"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA (без адрасоў)"
 
@@ -16627,9 +16641,19 @@ msgstr "Інспектар OSM: Берагавая лінія (ЕС)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "Здымкі з imagico.de: горны масіў Праклецце"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "Здымкі з imagico.de: «Паўднёвыя» Трансантарктычныя горы"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "Здымкі з imagico.de: горы Пенсакала"
 
@@ -16637,12 +16661,13 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 "Здымкі з imagico.de: выспа Мардвінава (Элефант)/выспа Шышкава (Кларанс)"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16684,15 +16709,30 @@ msgstr "LPI NSW адміністрацыйныя межы ахоўваных п
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "Здымкі з imagico.de: паўночны захад выспы Херд"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "Здымкі з imagico.de: узбярэжжа выспы Херд"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at артафота"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16708,6 +16748,12 @@ msgstr "Tiris: DOM (мадэль паверхні)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: гарызанталі"
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Вена: шматмэтавая карта (агульнага прызначэння)"
 
@@ -16813,9 +16859,15 @@ msgstr "Бенін: Катану 2016 (Pleiade)"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "Здымкі з imagico.de: Катану"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "Здымкі з imagico.de: выспа Буве"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Карта гарадскіх раёнаў"
 
@@ -16825,6 +16877,9 @@ msgstr "IBGE Карта сельскіх раёнаў"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Федэральная акруга"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Рыа, мазаіка 2013"
 
@@ -16909,9 +16964,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Гідраграфія"
 
@@ -16927,31 +17009,60 @@ msgstr "Брытанская Калумбія Мазаіка"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Апошнія здымкі Landsat паўднёвага захаду Брытанскай Калумбіі"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Келоўна 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Келоўна - оверлэй дарог"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "Здымкі з imagico.de: усходняе ўзбярэжжа выспы Дэвон"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "Здымкі з imagico.de: поўнач выспы Элсмір"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr "Здымкі з imagico.de: выспа Элсмір, ліпень 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "Здымкі з imagico.de: выспа Фагу, Каба-Вэрдэ"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "Здымкі з imagico.de: выспа Ландандэры"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "Здымкі з imagico.de: вулкан Кальбуко"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Чэхія CUZK:KM"
 
@@ -16970,14 +17081,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Данія)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen: кадастравыя ўчасткі па INSPIRE"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Геададзеныя агенцтва DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "Данія: адмыўка рэльефу SDFE (40 см)"
@@ -16985,22 +17096,32 @@ msgstr "Данія: адмыўка рэльефу SDFE (40 см)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "Данія: адмыўка паверхні SDFE (40 см)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Геададзеныя агенцтва Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Стэвнс (Данія)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Данія)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "Здымкі з imagico.de: вулкан Алтар"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "Здымкі з imagico.de: выспы Дарвін (Кулпепер) і Вулф (Уэнмен), Галапагос"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Эстонія Базавая карта (Maaamet)"
 
@@ -17019,6 +17140,9 @@ msgstr "Эстонія лясы (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Карфаген"
 
@@ -17031,6 +17155,9 @@ msgstr "Бардо - 2012"
 msgid "Cadastre"
 msgstr "Кадастр"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Овернь 2013 - 25 см"
 
@@ -17160,18 +17287,23 @@ msgstr ""
 "Германіі"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
 "Германіі (інфрачырвоныя здымкі)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17204,9 +17336,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "Здымкі з imagico.de: Касігіянгуіт"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "Здымкі з imagico.de: авіябаза Туле"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17215,6 +17353,10 @@ msgstr ""
 "2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr "Здымкі з imagico.de: авіябаза Туле - DMS, аблёт у верасні 2015"
@@ -17226,15 +17368,31 @@ msgstr "Здымкі з imagico.de: авіябаза Туле - DMS, аблёт
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "Здымкі з imagico.de: мазаіка Грэнландыі"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "Здымкі з imagico.de: Landsat не ў надзіры (травень 2013)"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr "Здымкі з imagico.de: Landsat не ў надзіры (ліпень 2016)"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "Здымкі з imagico.de: поўнач Грэнландыі (ASTER)"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Здымкі дронаў (Гаіці)"
 
@@ -17295,18 +17453,37 @@ msgstr "Вугоршчына: рэльеф"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "Здымкі з imagico.de: усход Ісландыі"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "Здымкі з imagico.de: Качскі Ран"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "Здымкі з imagico.de: паўднёвы ўсход Сулавесі"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "Здымкі з imagico.de: вадасховішча Бакун"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "Здымкі з imagico.de: Батам"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ірландыя Міністэрства абароны Вялікабрытаніі 1:25000 GSGS 3906"
 
@@ -17371,18 +17548,29 @@ msgstr "Паўднёвы Ціроль - артафота 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Паўднёвы Тыроль ортафота 2011 (высокая разрознасць)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Паўднёвы Тыроль - ортафота 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Паўднёвы Ціроль - тапакарта"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Японія: ортаздымкі GSI"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "Здымкі з imagico.de: гара Кенія, 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "СССР - Латвія"
 
@@ -17416,26 +17604,35 @@ msgstr "Люксембург Inspire Воды"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Дэльта Нігера, кастрычнік 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "Аэрафотаздымкі PDOK 25 см (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "Аэрафотаздымкі PDOK 25 см (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Шпіцберген - артафота 2009/2011 EPSG: 25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "Здымкі з imagico.de: заходняя частка Каракарума"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Сектар Газа - Pléiades - 06.07.2014"
 
@@ -17445,15 +17642,29 @@ msgstr "Сектар Газа - Pléiades - 06.07.2014 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr "Здымкі з imagico.de: Панамскі канал - ціхаакіянскі бок"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "Здымкі з imagico.de: Панамскі канал"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "Здымкі з imagico.de: Ванацінаі"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "Здымкі з imagico.de: Новая Ірландыя"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "Здымкі з imagico.de: Карапуна"
 
@@ -17463,6 +17674,9 @@ msgstr ""
 "Здымкі з imagico.de: хрыбет Кардыльера-дэ-Вільканота і ледавіковая шапка "
 "Келькая"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17601,23 +17815,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "Здымкі з imagico.de: Керчанскі праліў"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "Здымкі з imagico.de: выспа Ушакова, жнівень 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr "Здымкі з imagico.de: Паўночны і Палярны Урал, жнівень 2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "Здымкі з imagico.de: касмадром Усходні"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr ""
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17644,18 +17870,34 @@ msgstr "RABA-KGZ: Славенія - вобласці забудовы"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Гарадская акруга Кейптаўн: аэраздымка 2013"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Кейптаўн, аэрафотаздымка 2015"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Паўднёвая Афрыка CD: NGI аэрафотаздымкі"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "Здымкі з imagico.de: выспа Ляскова (ASTER)"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "Здымкі з imagico.de: выспа Скота"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "Здымкі з imagico.de: выспа Ляскова (Landsat)"
 
@@ -17689,6 +17931,9 @@ msgstr "GRAFCAN Express - Канарскія выспы"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "Здымкі з imagico.de: Адамаў Мост"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Кантон Аргаў 25 см (AGIS 2011)"
 
@@ -17767,12 +18012,20 @@ msgstr "Кантон Базель - ландшафт 10см (2015)"
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr "Здымкі з imagico.de: Цэнтральныя Альпы, канец верасня 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Тайвань e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Тайвань e-Map Open Data (з лініямі вышынь)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Тайвань межы пасяленняў"
 
@@ -17828,8 +18081,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "Здымкі з imagico.de: Аляскінскі хрыбет"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17904,9 +18157,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Дэлавэр - ортафота 2012"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "Здымкі з imagico.de: горы Рувензоры"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "Здымкі з imagico.de: горы Рувензоры, 2016"
 
@@ -17958,240 +18222,615 @@ msgstr "NLS - выд. Bartholomew, паўцалевая, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "Планы гарадоў ад OS, Абердзін 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Эйрдры 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Александрыя 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "Планы гарадоў ад OS, Алоа 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Анан 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Аброас 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "Планы гарадоў ад OS, Эр 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "Планы гарадоў ад OS, Бервік-апон-Твід 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "Планы гарадоў ад OS, Брэхін 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Бурнтісланд 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "Планы гарадоў ад OS, Кемпбелтон 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Коатбрыдж 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS: планы гарадоў, Купар 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Купар 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "Планы гарадоў ад OS, Далкейт 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Далкейт 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Дамбартон 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "Планы гарадоў ад OS, Дамфрыз 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Дамфрыз 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Дандзі 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "Планы гарадоў ад OS, Дандзі 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "Планы гарадоў ад OS, Данфермлін 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Данфермлін 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "Планы гарадоў ад OS, Эдынбург 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "Планы гарадоў ад OS, Эдынбург 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Эдынбург 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Town Plans, Эдзінбург 1940-1960 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Элгін 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Фалкірк 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "Планы гарадоў ад OS, Форфар 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Форэс 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Галашылс 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "Планы гарадоў ад OS, Гірван 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Глазга 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Глазга 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "Планы гарадоў ад OS, Грынок 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "Планы гарадоў ад OS, Хадзінгтон 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Хадзінгтон 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Гамільтан 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Хоік 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Інвернес 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Ірвін 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Джэдбург 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "Планы гарадоў ад OS, Келсо 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Кілмарнок 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "Планы гарадоў ад OS, Кіркалдзі 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Кіркалдзі 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "Планы гарадоў ад OS, Кіркудбрайт 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Кіркудбрайт 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "Планы гарадоў ад OS, Кёркентылек 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "Планы гарадоў ад OS, Кір’емуір1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Ланарк 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "Планы гарадоў ад OS, Лінлітго 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "Планы гарадоў ад OS, Маёль 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "Планы гарадоў ад OS, Мантроўз 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "Планы гарадоў ад OS, Масельбург 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Масельбург 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Наірн 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Обан 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Пэйслі 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "Планы гарадоў ад OS, Піблз 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "Планы гарадоў ад OS, Перт 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "Планы гарадоў ад OS, Петэрхед 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "Планы гарадоў ад OS, Порт Глазга 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Портабела 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "Планы гарадоў ад OS, Ротсей 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "Планы гарадоў ад OS, Селкірк 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "Планы гарадоў ад OS, Сэнт-Эндрус 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Сэнт-Эндрус 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Сцірлінг 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "Планы гарадоў ад OS, Стонхейвен 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "Планы гарадоў ад OS, Странраер 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "Планы гарадоў ад OS, Странраер 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "Планы гарадоў ад OS, Странраер 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "Планы гарадоў ад OS, Стартхевен 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "Планы гарадоў ад OS, Вік 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "Планы гарадоў ад OS, Вігтон 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "Планы гарадоў ад OS, Вігтон 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24951,6 +25590,9 @@ msgstr "Морапрадукты"
 msgid "Dairy"
 msgstr "Малочныя прадукты"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Дэлікатэсы"
 
@@ -27258,6 +27900,9 @@ msgstr "{0} павінен быць дадатным цэлым лікам"
 msgid "unusual value of {0}"
 msgstr "незвычайнае значэнне {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "дачыненне без тыпу"
 
@@ -28268,6 +28913,9 @@ msgstr ""
 msgid "Import"
 msgstr "Імпартаваць"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29249,6 +29897,29 @@ msgstr "Адладка"
 msgid "Debugging mode will write images for each processing step."
 msgstr "У рэжыме адладкі будуць створаны выявы для кожнага кроку апрацоўкі."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29258,6 +29929,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -34071,24 +34745,6 @@ msgstr "Знак {0}"
 msgid "Additional sign {0}"
 msgstr "Дадатковы знак {0}"
 
-msgid "Edit relation"
-msgstr "Рэдагаваць дачыненне"
-
-msgid "Edit relations"
-msgstr "Рэдагаваць дачыненні"
-
-msgid "No relation is selected"
-msgstr "Дачыненне не выбрана"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Выдаліць пункт ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Выдаліць лінію ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Выдаліць дачыненне ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
-
 msgid "routing active route"
 msgstr "Маршрутызацыя: актыўны маршрут"
 
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index c6d59f8..088228a 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2016-08-05 14:02+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-03 05:56+0000\n"
 "Last-Translator: pl <Unknown>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:41+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: bg\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5543,6 +5543,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr "Моя версия (местна база данни)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Характеристики в моята база дании (локалната база данни)"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr "Тяхна версия (база данни на сървъра)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Характеристики в тяхната база дании (базата данни на сървъра)"
+
 msgid "My with Their"
 msgstr "Моя с Тяхния"
 
@@ -5625,26 +5642,6 @@ msgstr "Възел"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Характеристики в моята база дании (локалната база данни)"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Характеристики в тяхната база дании (базата данни на сървъра)"
-
-msgid "Coordinates:"
-msgstr "Координати:"
-
-msgid "Deleted State:"
-msgstr "Изтрито състояние:"
-
-msgid "Referenced by:"
-msgstr ""
-
 msgid "(none)"
 msgstr "(никой)"
 
@@ -5654,6 +5651,15 @@ msgstr "изтрито"
 msgid "not deleted"
 msgstr "не е изтрито"
 
+msgid "Deleted State:"
+msgstr "Изтрито състояние:"
+
+msgid "Coordinates:"
+msgstr "Координати:"
+
+msgid "Referenced by:"
+msgstr ""
+
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5699,12 +5705,6 @@ msgstr "Ключ"
 msgid "Value"
 msgstr "Стойност"
 
-msgid "My version (local dataset)"
-msgstr "Моя версия (местна база данни)"
-
-msgid "Their version (server dataset)"
-msgstr "Тяхна версия (база данни на сървъра)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -9659,7 +9659,7 @@ msgid "The selected photos do not contain time information."
 msgstr "Избраните снимки не съдържат времева информация."
 
 msgid "Photos do not contain time information"
-msgstr "Снимките не съдържат времева информация"
+msgstr "Снимките не съдържат информация за дата и час"
 
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10336,9 +10336,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12067,7 +12064,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарска Мрежа (Швейцария)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -12528,7 +12525,7 @@ msgid "Use the error layer to display problematic elements."
 msgstr "Изпозване на слой за грешки за показване на проблемите елементи."
 
 msgid "Show informational level."
-msgstr ""
+msgstr "Показване на информационен слой."
 
 msgid "Show the informational tests."
 msgstr ""
@@ -13346,7 +13343,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14476,9 +14478,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URLне съдържа {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14488,9 +14487,6 @@ msgstr "Обновете Java"
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14501,9 +14497,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Искате ли да обновите сега?"
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14632,7 +14636,7 @@ msgid ""
 msgstr ""
 
 msgid "Debug information"
-msgstr ""
+msgstr "Информация за дебъгване"
 
 msgid "Manually report at:"
 msgstr ""
@@ -15090,6 +15094,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -15117,6 +15127,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
 
@@ -15147,6 +15160,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -15195,21 +15211,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15251,15 +15278,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15275,6 +15317,12 @@ msgstr "Tiris: DOM (Surface model)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -15380,9 +15428,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -15392,6 +15446,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15476,9 +15533,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -15494,31 +15578,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -15537,13 +15650,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15552,21 +15665,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -15585,6 +15708,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15597,6 +15723,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Кадастър"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15726,16 +15855,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15768,15 +15902,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15788,15 +15932,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -15857,18 +16017,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -15932,18 +16111,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -15977,26 +16167,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -16006,15 +16205,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16022,6 +16235,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16160,23 +16376,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16203,18 +16431,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16248,6 +16492,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -16326,12 +16573,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16387,8 +16642,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16463,9 +16718,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -16517,240 +16783,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -20506,10 +21147,10 @@ msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 msgid "Information Office"
-msgstr "Информационен пункт"
+msgstr "Информационен център"
 
 msgid "An office where you can get information about a town or region."
-msgstr ""
+msgstr "Офис, където можете да получите информация за града или региона."
 
 msgid "Map"
 msgstr "Карта"
@@ -20569,7 +21210,7 @@ msgid "Information Board"
 msgstr "Информационно табло"
 
 msgid "A board with information."
-msgstr ""
+msgstr "Табло с информация."
 
 msgid "Board Content"
 msgstr "Съдържание на таблото"
@@ -20603,7 +21244,7 @@ msgid "Information Terminal"
 msgstr "Информационен пункт"
 
 msgid "Information access via electronic methods."
-msgstr ""
+msgstr "Електронен достъп до информация."
 
 msgid "Closer description"
 msgstr "По-точно описание"
@@ -20612,7 +21253,7 @@ msgid "Audio Guide"
 msgstr ""
 
 msgid "Information using headphones or a mobile phone."
-msgstr ""
+msgstr "Използване на слушалки или мобилен телефон."
 
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
@@ -20621,7 +21262,7 @@ msgid "Phone number"
 msgstr "Тел. номер"
 
 msgid "Other Information Point"
-msgstr ""
+msgstr "Друга информация за туристи"
 
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
@@ -23351,6 +23992,9 @@ msgstr "Морски деликатеси"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Деликатесен магазин"
 
@@ -24744,7 +25388,7 @@ msgstr ""
 
 msgctxt "description=*"
 msgid "A short text with additional information."
-msgstr "Къс текст с допълнителна информация."
+msgstr "Кратък текст с допълнителна информация."
 
 msgctxt "description=*"
 msgid ""
@@ -25598,6 +26242,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26572,6 +27219,9 @@ msgstr ""
 msgid "Import"
 msgstr "Импорт"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27424,6 +28074,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27433,6 +28106,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -29310,7 +29986,7 @@ msgid "Created by {0} on {1}"
 msgstr ""
 
 msgid "Offset Information"
-msgstr ""
+msgstr "Информация за отместването"
 
 msgid "Report this offset"
 msgstr ""
@@ -30532,8 +31208,8 @@ msgstr ""
 
 msgid "JOSM could not find information about the following module:"
 msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM не може да намери информация за следния модул:"
+msgstr[1] "JOSM не може да намери информация за следните модули:"
 
 msgid "The module is not going to be loaded."
 msgid_plural "The modules are not going to be loaded."
@@ -32018,24 +32694,6 @@ msgstr "Знак {0}"
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Редактиране на релация"
-
-msgid "Edit relations"
-msgstr "Редактиране на релации"
-
-msgid "No relation is selected"
-msgstr "Не е избрана релация"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Изтриване на възел ''{0}'' на позиция {1} от релация ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Изтриване на път ''{0}'' на позиция {1} от релация ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Изтриване на релация ''{0}'' на позиция {1} от релация ''{2}''"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 640c43b..715b12e 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-04-03 09:24+0000\n"
 "Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
 "Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:38+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:39+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: bn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5394,6 +5394,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5476,33 +5493,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5550,12 +5556,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10119,9 +10119,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11818,7 +11815,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13087,7 +13084,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14204,9 +14206,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14216,9 +14215,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14229,9 +14225,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14814,6 +14818,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14841,6 +14851,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14871,6 +14884,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14919,21 +14935,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14975,15 +15002,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14999,6 +15041,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15104,9 +15152,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15116,6 +15170,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15200,9 +15257,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15218,31 +15302,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15261,13 +15374,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15276,21 +15389,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15309,6 +15432,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15321,6 +15447,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15448,16 +15577,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15490,15 +15624,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15510,15 +15654,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15579,18 +15739,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15654,18 +15833,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15699,26 +15889,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15728,15 +15927,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15744,6 +15957,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15882,23 +16098,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15925,18 +16153,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15970,6 +16214,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16048,12 +16295,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16109,8 +16364,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16134,345 +16389,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23058,6 +23699,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25303,6 +25947,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26275,6 +26922,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27127,6 +27777,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27136,6 +27809,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31673,24 +32349,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/br.po b/i18n/po/br.po
index dcd1550..5741b00 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-10-17 12:11+0000\n"
 "Last-Translator: Fulup <Unknown>\n"
 "Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:40+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: br\n"
 
 msgid "License"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 8d3f007..9fd17f3 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2012-11-03 23:07+0000\n"
 "Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
 "Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:39+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: bs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5394,6 +5394,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5476,33 +5493,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5550,12 +5556,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10119,9 +10119,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11818,7 +11815,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13087,7 +13084,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14204,9 +14206,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14216,9 +14215,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14229,9 +14225,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14814,6 +14818,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14841,6 +14851,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14871,6 +14884,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14919,21 +14935,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14975,15 +15002,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14999,6 +15041,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15104,9 +15152,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15116,6 +15170,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15200,9 +15257,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15218,31 +15302,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15261,13 +15374,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15276,21 +15389,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15309,6 +15432,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15321,6 +15447,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15448,16 +15577,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15490,15 +15624,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15510,15 +15654,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15579,18 +15739,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15654,18 +15833,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15699,26 +15889,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15728,15 +15927,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15744,6 +15957,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15882,23 +16098,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15925,18 +16153,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15970,6 +16214,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16048,12 +16295,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16109,8 +16364,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16134,345 +16389,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23058,6 +23699,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25303,6 +25947,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26275,6 +26922,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27127,6 +27777,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27136,6 +27809,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31673,24 +32349,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index fc25463..99407e4 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-03-14 22:52+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:41+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ca\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5874,6 +5874,28 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "La seva versió ({0} entrada)"
 msgstr[1] "La seva versió ({0} entrades)"
 
+msgid "My version (local dataset)"
+msgstr "La meva versió (conjunt local de dades)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Propietats del meu conjunt de dades, per exemple el conjunt local de dades"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propietats de l''element combinat resultant que substituiran les propietats "
+"dels meus elements quan s''apliqui la fusió."
+
+msgid "Their version (server dataset)"
+msgstr "La seva versió (conjunt de dades del servidor)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propietats del seu conjunt de dades, per exemple el conjunt de dades del "
+"servidor"
+
 msgid "My with Their"
 msgstr "La meva amb la seva"
 
@@ -5962,31 +5984,6 @@ msgstr ""
 "La fusió dels nodes encara no ha estat bloquejada. No és possible de "
 "construir la comanda de resolució."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Propietats del meu conjunt de dades, per exemple el conjunt local de dades"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propietats de l''element combinat resultant que substituiran les propietats "
-"dels meus elements quan s''apliqui la fusió."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propietats del seu conjunt de dades, per exemple el conjunt de dades del "
-"servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenades:"
-
-msgid "Deleted State:"
-msgstr "Estat del conjunt de dades:"
-
-msgid "Referenced by:"
-msgstr "Referenciat per:"
-
 msgid "(none)"
 msgstr "(cap)"
 
@@ -5996,6 +5993,15 @@ msgstr "suprimit"
 msgid "not deleted"
 msgstr "no suprimit"
 
+msgid "Deleted State:"
+msgstr "Estat del conjunt de dades:"
+
+msgid "Coordinates:"
+msgstr "Coordenades:"
+
+msgid "Referenced by:"
+msgstr "Referenciat per:"
+
 msgid "Keep my coordinates"
 msgstr "Conservar les meves coordenades"
 
@@ -6044,12 +6050,6 @@ msgstr "Clau"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "La meva versió (conjunt local de dades)"
-
-msgid "Their version (server dataset)"
-msgstr "La seva versió (conjunt de dades del servidor)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Conservar la parella clau/valor del conjunt de dades local"
 
@@ -11153,9 +11153,6 @@ msgstr "Tancar la finestra i anul·lar l''autorització"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Tanca la finestra i accepta el testimoni d''autenticació"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Ha fallat l''anul·lació de l''operació OAuth en execució"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Obtenint una petició de testimoni Oauth de ''{0}''"
 
@@ -13035,8 +13032,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suïssa)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sense correccions locals)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupe Fort-Marigot 1949"
@@ -14471,10 +14468,13 @@ msgstr "La lectura ha estat cancel·lada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Manquen atributs obligatoris a l''element ''bounds''. Ara hi ha "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "La via esborrada {0} conté nodes"
@@ -15838,9 +15838,6 @@ msgstr "Obrint l''URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "l''URL no conté {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reservat"
-
 msgid "Outdated Java version"
 msgstr "Versió obsoleta de Java"
 
@@ -15850,9 +15847,6 @@ msgstr "Actualitzeu Java"
 msgid "You are running version {0} of Java."
 msgstr "Utilitzeu la versió {0} de Java."
 
-msgid "April 2015"
-msgstr "Abril 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15867,9 +15861,17 @@ msgstr ""
 "JOSM deixarà de funcionar aviat amb aquesta versió; recomanem actualitzar "
 "vers la versió de Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Voleu actualitzar-la ara?"
 
+msgid "reserved"
+msgstr "reservat"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16491,6 +16493,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satèl·lit"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16518,6 +16526,9 @@ msgstr "OpenStreetMap (Estil alemany)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap Tracks GPS"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transport públic (ÖPNV)"
 
@@ -16548,6 +16559,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA sense adreces"
 
@@ -16596,21 +16610,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16652,15 +16677,30 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Ortofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16676,6 +16716,12 @@ msgstr "Tiris: DOM (Model de superfície)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (propòsit general)"
 
@@ -16781,9 +16827,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Sectors Urbans"
 
@@ -16793,6 +16845,9 @@ msgstr "IBGE Mapa de Sectors Rurals"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16877,9 +16932,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hidrografia"
 
@@ -16895,31 +16977,60 @@ msgstr "Mosaic Columbia Britànica"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna carreteres"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Txèquia CUZK:KM"
 
@@ -16938,14 +17049,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Dinamarca)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -16953,21 +17064,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Mapa base d''Estònia  (Maaamet)"
 
@@ -16986,6 +17107,9 @@ msgstr "Estònia Silvicultura (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16998,6 +17122,9 @@ msgstr "Bordeus - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17128,16 +17255,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17170,15 +17302,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17190,15 +17332,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imatgeria de drones (Haiti)"
 
@@ -17259,18 +17417,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17334,18 +17511,29 @@ msgstr "Tirol de Sud Ortofotomapa 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "Tirol de Sud topogràfic"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Letònia"
 
@@ -17379,26 +17567,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta del Níger Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Ortofoto Svalbard 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Franja de Gaza - Pléiades - 2014/07/06"
 
@@ -17408,15 +17605,29 @@ msgstr "Franja de Gaza - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17424,6 +17635,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17562,23 +17776,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17605,18 +17831,34 @@ msgstr "RABA-KGZ: Eslovènia àrees edificades"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sud-àfrica CD:NGI Aeri"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17650,6 +17892,9 @@ msgstr "GRAFCAN Express - Illes Canàries"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17728,12 +17973,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (amb corbes de nivell)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan (límits de poblacions)"
 
@@ -17789,8 +18042,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17865,9 +18118,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17919,240 +18183,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24913,6 +25552,9 @@ msgstr "Peixateria"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delicatessen (al detall)"
 
@@ -27205,6 +27847,9 @@ msgstr "{0} ha de ser un nombre sencer i positiu"
 msgid "unusual value of {0}"
 msgstr "valor no usual per a {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relació sense tipus"
 
@@ -28212,6 +28857,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importa"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29193,6 +29841,29 @@ msgid "Debugging mode will write images for each processing step."
 msgstr ""
 "El mode de depuració d''errors escriurà imatges per a cada etapa del procés."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29202,6 +29873,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -34064,24 +34738,6 @@ msgstr "Senyal {0}"
 msgid "Additional sign {0}"
 msgstr "Senyal addicional {0}"
 
-msgid "Edit relation"
-msgstr "Modificar relació"
-
-msgid "Edit relations"
-msgstr "Modificar relacions"
-
-msgid "No relation is selected"
-msgstr "Cap relació ha estat seleccionada"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir el node ''{0}'' a la posició {1} de la relació ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir la via ''{0}'' a la posició {1} de la relació ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir la relació ''{0}'' de la posició {1} a la relació ''{2}''"
-
 msgid "routing active route"
 msgstr "calculant l''itinerari actiu"
 
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index c3039fa..1867c31 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-04-25 18:52+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:19+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:21+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ca at valencia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5771,6 +5771,28 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "La seua versió ({0} entrada)"
 msgstr[1] "La seua versió ({0} entrades)"
 
+msgid "My version (local dataset)"
+msgstr "La meua versió (conjunt local de dades)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Propietats del meu conjunt de dades, per exemple el conjunt local de dades"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propietats de l''element combinat resultant que substituiran les propietats "
+"dels meus elements quan s''apliqui la fusió."
+
+msgid "Their version (server dataset)"
+msgstr "La seua versió (conjunt de dades del servidor)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propietats del seu conjunt de dades, per exemple el conjunt de dades del "
+"servidor"
+
 msgid "My with Their"
 msgstr "La meua amb la seua"
 
@@ -5859,31 +5881,6 @@ msgstr ""
 "La fusió dels nodes encara no ha estat bloquejada. No és possible de "
 "construir la comanda de resolució."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Propietats del meu conjunt de dades, per exemple el conjunt local de dades"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propietats de l''element combinat resultant que substituiran les propietats "
-"dels meus elements quan s''apliqui la fusió."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propietats del seu conjunt de dades, per exemple el conjunt de dades del "
-"servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenades:"
-
-msgid "Deleted State:"
-msgstr "Estat del conjunt de dades:"
-
-msgid "Referenced by:"
-msgstr "Referenciat per:"
-
 msgid "(none)"
 msgstr "(cap)"
 
@@ -5893,6 +5890,15 @@ msgstr "suprimit"
 msgid "not deleted"
 msgstr "no suprimit"
 
+msgid "Deleted State:"
+msgstr "Estat del conjunt de dades:"
+
+msgid "Coordinates:"
+msgstr "Coordenades:"
+
+msgid "Referenced by:"
+msgstr "Referenciat per:"
+
 msgid "Keep my coordinates"
 msgstr "Conservar les meues coordenades"
 
@@ -5941,12 +5947,6 @@ msgstr "Clau"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "La meua versió (conjunt local de dades)"
-
-msgid "Their version (server dataset)"
-msgstr "La seua versió (conjunt de dades del servidor)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Conservar la parella clau/valor del conjunt de dades local"
 
@@ -10987,9 +10987,6 @@ msgstr "Tancar la finestra i anul·lar l''autorització"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Tanca la finestra i accepta el testimoni d''autenticació"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Ha fallat l''anul·lació de l''operació OAuth en execució"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Obtenint una petició de testimoni Oauth de ''{0}''"
 
@@ -12865,8 +12862,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suïssa)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sense correccions locals)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupe Fort-Marigot 1949"
@@ -14282,10 +14279,13 @@ msgstr "La lectura ha estat cancel·lada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Manquen atributs obligatoris a l''element ''bounds''. Ara hi ha "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "La via esborrada {0} conté nodes"
@@ -15644,9 +15644,6 @@ msgstr "Obrint la URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr "reservat"
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -15656,9 +15653,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15669,9 +15663,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr "reservat"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16283,6 +16285,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -16310,6 +16318,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -16340,6 +16351,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -16388,21 +16402,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16444,15 +16469,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16468,6 +16508,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16573,9 +16619,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -16585,6 +16637,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16669,9 +16724,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16687,31 +16769,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16730,13 +16841,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16745,21 +16856,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16778,6 +16899,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16790,6 +16914,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16917,16 +17044,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16959,15 +17091,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16979,15 +17121,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -17048,18 +17206,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -17123,18 +17300,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -17168,26 +17356,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -17197,15 +17394,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17213,6 +17424,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17351,23 +17565,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17394,18 +17620,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17439,6 +17681,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -17517,12 +17762,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17578,8 +17831,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17654,9 +17907,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17708,240 +17972,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24638,6 +25277,9 @@ msgstr "Peixateria"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delicatessen (al detall)"
 
@@ -26883,6 +27525,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relació sense tipus"
 
@@ -27882,6 +28527,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importa"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28847,6 +29495,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28856,6 +29527,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33697,24 +34371,6 @@ msgstr "Senyal {0}"
 msgid "Additional sign {0}"
 msgstr "Senyal addicional {0}"
 
-msgid "Edit relation"
-msgstr "Modificar relació"
-
-msgid "Edit relations"
-msgstr "Modificar relacions"
-
-msgid "No relation is selected"
-msgstr "Cap relació ha estat seleccionada"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir el node ''{0}'' a la posició {1} de la relació ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir la via ''{0}'' a la posició {1} de la relació ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Suprimir la relació ''{0}'' de la posició {1} a la relació ''{2}''"
-
 msgid "routing active route"
 msgstr "calculant l''itinerari actiu"
 
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 99206c7..8e65951 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-28 03:15+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-12 06:30+0000\n"
 "Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
 "Language-Team: Czech <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:41+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:42+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: cs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5838,6 +5838,25 @@ msgstr[0] "Cizí verze ({0} položka)"
 msgstr[1] "Cizí verze ({0} položky)"
 msgstr[2] "Cizí verze ({0} položek)"
 
+msgid "My version (local dataset)"
+msgstr "Moje verze (místní datová sada)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Vlastnosti v mé datové sadě, např. místní datové sadě"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Vlastnosti slučovaného prvku. Nahradí vlastnosti v mých prvcích, pokud bude "
+"sloučení aplikováno."
+
+msgid "Their version (server dataset)"
+msgstr "Cizí verze (serverová datová sada)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Vlastnosti v cizí datové sadě, např. serverové datové sadě"
+
 msgid "My with Their"
 msgstr "Můj s cizím"
 
@@ -5927,28 +5946,6 @@ msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Slučované uzly nejsou dosud zablokované. Příkaz pro řešení nelze vytvořit."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Vlastnosti v mé datové sadě, např. místní datové sadě"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Vlastnosti slučovaného prvku. Nahradí vlastnosti v mých prvcích, pokud bude "
-"sloučení aplikováno."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Vlastnosti v cizí datové sadě, např. serverové datové sadě"
-
-msgid "Coordinates:"
-msgstr "Souřadnice:"
-
-msgid "Deleted State:"
-msgstr "Stav smazáno:"
-
-msgid "Referenced by:"
-msgstr "Odkazováno z:"
-
 msgid "(none)"
 msgstr "(žádné)"
 
@@ -5958,6 +5955,15 @@ msgstr "smazáno"
 msgid "not deleted"
 msgstr "nesmazáno"
 
+msgid "Deleted State:"
+msgstr "Stav smazáno:"
+
+msgid "Coordinates:"
+msgstr "Souřadnice:"
+
+msgid "Referenced by:"
+msgstr "Odkazováno z:"
+
 msgid "Keep my coordinates"
 msgstr "Ponechat moje souřadnice"
 
@@ -6004,12 +6010,6 @@ msgstr "Klíč"
 msgid "Value"
 msgstr "Hodnota"
 
-msgid "My version (local dataset)"
-msgstr "Moje verze (místní datová sada)"
-
-msgid "Their version (server dataset)"
-msgstr "Cizí verze (serverová datová sada)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Ponechat vybrané páry klíč/hodnota z místní datové sady"
 
@@ -11088,9 +11088,6 @@ msgstr "Zavřít dialog a zrušit přihlášení"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Zavřít dialog a přijmout přístupový token"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Nepodařilo se přerušit probíhající operaci OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Získávám požadavkový token OAuth z ''{0}''"
 
@@ -12931,8 +12928,8 @@ msgstr "Zóna PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Švýcarský Grid"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (bez lokálních korekcí)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14323,10 +14320,15 @@ msgstr "Čtení bylo zrušeno"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Chybí povinné atributy ohraničení prvku. Mám "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Neplatné hodnoty atributů ''lat'', ''lon'' na uzlu ID {0}. Dostal jsem "
+"''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Smazaná cesta {0} obsahuje uzly"
@@ -15694,9 +15696,6 @@ msgstr "Otvírám URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL neobsahuje {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "rezervované"
-
 msgid "Outdated Java version"
 msgstr "Zastaralá verze Java"
 
@@ -15706,9 +15705,6 @@ msgstr "Aktualizovat Java"
 msgid "You are running version {0} of Java."
 msgstr "Je spuštěna Java verze {0}."
 
-msgid "April 2015"
-msgstr "duben 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15722,9 +15718,17 @@ msgstr ""
 "JOSM brzy přestane s touto verzí pracovat. Důrazně doporučujeme aktualizovat "
 "na Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Chcete aktualizovat nyní?"
 
+msgid "reserved"
+msgstr "rezervované"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16358,6 +16362,12 @@ msgstr "HDM (Humanitární tým OpenStreetMap)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "Prvotřídní snímky DigitalGlobe"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "Standardní snímky DigitalGlobe"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16385,6 +16395,9 @@ msgstr "OpenStreetMap (německý styl)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap trasy GPS"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Veřejné stopy GPS nahrané na OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Veřejná doprava (ÖPNV)"
 
@@ -16415,6 +16428,9 @@ msgstr "Strava heatmap - jízda na kole a běh"
 msgid "Locator Overlay"
 msgstr "Překryvná vrstva Locator"
 
+msgid "Shows major features to help orient you."
+msgstr "Ukáže hlavní prvky, které vám pomohou se zorientovat."
+
 msgid "QA No Address"
 msgstr "QA Žádná adresa"
 
@@ -16463,24 +16479,38 @@ msgstr "OSM Inspector: Pobřeží (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Snímky z pozdního léta míst, která jsou na obvyklých zdrojích silně "
+"znehodnocena mraky a sněhem (pravé barvy)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+"Mimo normální pokrytí Landsat a tedy neobsaženo v LIMA a Bing/Mapbox (pravé "
+"barvy)"
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+"Celkem čisté aktuální snímky pro aktualizaci okrajů ledovce (pravé barvy)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
-msgstr ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
+msgstr "Snímky Sentinel-2 oblasti Enderby Land a Kemp Coast (pravé barvy)"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Argentina (TMS)"
@@ -16521,15 +16551,33 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+"Ledovce na Northwest Heard Island (mezitím zmapované) (falešné barvy IČ)"
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM images for mapping: Heard Island coast"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+"Nedávné snímky ostrova Heard, kde vnitrozemí je zakryté mraky, ale pobřeží "
+"je dobře vidět (pravé barvy)"
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Základní mapa Rakouska založená na vládních datech."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Vrstva ortofoto poskytnutá basemap.at. "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16545,6 +16593,12 @@ msgstr "Tiris: DOM (model povrchu)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: obrysové linie"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: orthophoto"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: orthophoto infrared"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (obecná)"
 
@@ -16650,9 +16704,16 @@ msgstr "Benin: Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM images for mapping: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+"Nevyrovnané pokrytí částečně pokryté mraky v obvyklých zdrojích (pravé barvy)"
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM images for mapping: Bouvet Island"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr "Pro přesnější mapování pobřeží a ledovce (pravé barvy)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16662,6 +16723,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr "Adresní data z IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16746,9 +16810,36 @@ msgstr "Alagoas Litoral 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr "IBGE-BC250-Aglomerado Rural Isolado"
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr "IBGE-BC250-Pista de Pouso"
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr "IBGE-BC250-Rios Drenagem"
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Trecho Rodoviario"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr "IBGE-BC250-Terra Indigena"
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr "IBGE-BC250-Terra Publico (Militar)"
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr "IBGE-BC250-Unidade de Uso Sistentável - APA"
+
+msgid "IBGE-BC250-Villa"
+msgstr "Copy text \t IBGE-BC250-Villa"
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+
+msgid "IBGE-BCIM-Município"
+msgstr "IBGE-BCIM-Município"
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -16764,32 +16855,66 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Latest southwest British Columbia Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+"Nedávné snímky landsat o nízkém rozlišení jihozápadní Britské Kolumbie"
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "Vysoce kvalitní letecké snímky města Kelowna"
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr "Pobřeží, které bylo z většiny již zmapováno (falešné barvy IČ)"
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Sestaveno ze snímků ASTER červenec 2012  (pravé barvy s odhadnutou modrou)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Sestaveno ze snímků ASTER červenec 2016  (pravé barvy s odhadnutou modrou)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Snímek po erupci roku 2014/2015 (pravé barvy)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM images for mapping: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+"Zde lze vylepšit mnoho na hrubo nakreslených pobřeží, ovšem je zde hodně "
+"sněhu, takže nelze použít pro mapování ledovců (falešné barvy IČ)"
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Snímek po erupci roku 2015 (pravé barvy)"
+
 msgid "Czech CUZK:KM"
 msgstr "Český CUZK:KM"
 
@@ -16808,14 +16933,14 @@ msgstr "Praha IPR nejnovější orotofoto"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Praha IPR mimovegetační orotofoto"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Dánsko)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -16823,22 +16948,36 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dánsko)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dánsko)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM images for mapping: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+"Snímky ASTER 2007 nabízející lepší pokrytí ledovců než běžné zdroje (pravé "
+"barvy s odhadnutou modrou)"
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+"Nedávné snímky, v jiných zdrojích jsou momentálně pouze staré a špatné "
+"snímky (pravé barvy)"
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonsko základní (Maaamet)"
 
@@ -16857,6 +16996,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "Francouzský registr adres nebo Base Adresses Nationale"
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16869,6 +17011,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Katastr"
 
+msgid "French land registry"
+msgstr "Francouzký pozemkový katastr"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -16999,21 +17144,24 @@ msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
-
 msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Saxony latest aerial imagery"
@@ -17045,9 +17193,15 @@ msgstr "Munich latest aerial imagery 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM images for mapping: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM images for mapping: Thule Air Base"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17056,6 +17210,10 @@ msgstr ""
 "September 2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17070,15 +17228,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM images for mapping: Greenland mosaic"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -17139,18 +17313,37 @@ msgstr "Hillshade Hungary"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM images for mapping: Eastern Iceland"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM images for mapping: Rann of Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM images for mapping: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17214,18 +17407,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "South Tyrol Orthofoto 2011 (highres)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "South Tyrol Orthofoto 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japan GSI ortho Imagery"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de OSM images for mapping: Mount Kenya 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -17259,28 +17463,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "imagico.de OSM images for mapping: Svalbard mosaic"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de OSM images for mapping: Western Karakoram"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17290,15 +17501,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM images for mapping: Panama Canal"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM images for mapping: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM images for mapping: New Ireland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de OSM images for mapping: Coropuna"
 
@@ -17307,6 +17532,9 @@ msgid ""
 msgstr ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr "Pangasinán/Bulacan (Philippines HiRes)"
 
@@ -17445,9 +17673,21 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de OSM images for mapping: Kerch Strait"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "imagico.de OSM images for mapping: Ushakov Island August 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
@@ -17455,18 +17695,16 @@ msgstr ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
 
 msgid "Freemap.sk Car"
 msgstr "Freemap.sk Auto"
@@ -17492,18 +17730,34 @@ msgstr "RABA-KGZ: Slovenia built-up areas"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "City of Cape Town 2013 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "City of Cape Town 2015 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Jižní Afrika CD:NGI Letecká"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM images for mapping: Scott Island"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
 
@@ -17537,6 +17791,9 @@ msgstr "GRAFCAN Express - Kanárské ostrovy"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de OSM images for mapping: Adams Bridge"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17616,12 +17873,20 @@ msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (with Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Village Boundaries"
 
@@ -17683,11 +17948,9 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM images for mapping: Alaska Range"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "NJ 2015 Aerial Imagery (Infrared)"
@@ -17773,9 +18036,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 Orthophotography"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 
@@ -17827,240 +18101,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr "Nedávné snímky Landsat"
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24807,6 +25456,9 @@ msgstr "Mořské plody"
 msgid "Dairy"
 msgstr "Mléčné výrobky"
 
+msgid "Cheese"
+msgstr "Sýrárna"
+
 msgid "Deli (Fine Food)"
 msgstr "Delikatesy"
 
@@ -27109,6 +27761,9 @@ msgstr "{0} musí být celé kladné číslo"
 msgid "unusual value of {0}"
 msgstr "neobvyklá hodnota {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relace bez \"type\""
 
@@ -28118,41 +28773,46 @@ msgid "Go forward"
 msgstr "Vpřed"
 
 msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Které vrstvy obrázků chcete importovat do vrstvy Mapillary?"
 
 msgid "Import"
 msgstr "Import"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+"Nepodařilo se importovat obrázek se zem. souřadnicemi do vrstvy Mapillary!"
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
-msgstr ""
+msgstr "Z jakého zdroje chcete importovat obrázky do vrstvy Mapillary?"
 
 msgid "There are currently no layers with geotagged images!"
 msgstr ""
+"Momentálně nemáme žádné vrstvy s obrázky se zeměpisnými sourřadnicemi!"
 
 msgid "Images from my file system"
-msgstr ""
+msgstr "Obrázky z mého souborového systému"
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Zvolte obrázky, které chcete importovat"
 
 msgid "All images in a directory"
-msgstr ""
+msgstr "Všechny obrázky v adresáři"
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Zvolte adresář, ze kterého chcete importovat obrázky"
 
 msgid "From existing image layer"
-msgstr ""
+msgstr "Z existující vrstvy obrázků"
 
 msgid "Import exception"
-msgstr ""
+msgstr "Výjimka z importu"
 
 msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Nepodařilo se importovat obrázek ''{0}''!"
 
 msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "Nepodařilo se importovat adresář ''{0}''!"
 
 msgid ""
 "A tag with key <i>{0}</i> is already present on the selected OSM object."
@@ -29112,6 +29772,29 @@ msgstr "Ladění"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Režim ladění zapíše obrázky v každém kroku zpracování."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr "Načíst adresu"
 
@@ -29122,6 +29805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr "Pomocník s rakouskými adresami"
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr "Úspěšně přidána adresa k vybranému objektu:"
 
@@ -33945,24 +34631,6 @@ msgstr "Dopravní značka {0}"
 msgid "Additional sign {0}"
 msgstr "Doplňková dopravní značka {0}"
 
-msgid "Edit relation"
-msgstr "Upravit relaci"
-
-msgid "Edit relations"
-msgstr "Upravit relace"
-
-msgid "No relation is selected"
-msgstr "Nevybrána žádná relace"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odstranit uzel ''{0}'' na pozici {1} z relace ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odstranit cestu ''{0}'' na pozici {1} z relace ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odstranit relaci ''{0}'' na pozici {1} z relace ''{2}''"
-
 msgid "routing active route"
 msgstr "naviguji aktivní trasou"
 
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index c4681b1..0c91da8 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-07-17 21:45+0000\n"
 "Last-Translator: iggy23 <Unknown>\n"
 "Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:13+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:15+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: cy\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5392,6 +5392,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5474,33 +5491,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5548,12 +5554,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10117,9 +10117,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11816,7 +11813,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13085,7 +13082,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14202,9 +14204,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14214,9 +14213,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14227,9 +14223,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14812,6 +14816,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14839,6 +14849,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14869,6 +14882,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14917,21 +14933,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14973,15 +15000,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14997,6 +15039,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15102,9 +15150,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15114,6 +15168,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15198,9 +15255,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15216,31 +15300,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15259,13 +15372,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15274,21 +15387,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15307,6 +15430,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15319,6 +15445,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15446,16 +15575,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15488,15 +15622,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15508,15 +15652,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15577,18 +15737,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15652,18 +15831,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15697,26 +15887,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15726,15 +15925,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15742,6 +15955,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15880,23 +16096,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15923,18 +16151,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15968,6 +16212,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16046,12 +16293,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16107,8 +16362,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16132,345 +16387,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23056,6 +23697,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25301,6 +25945,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26273,6 +26920,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27125,6 +27775,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27134,6 +27807,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31671,24 +32347,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 70732f7..583721f 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-22 09:28+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-27 21:59+0000\n"
 "Last-Translator: Jørn <joern.map at gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:42+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:42+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -1025,7 +1025,7 @@ msgid "Separate Layer"
 msgstr "Separat lag"
 
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vælg hvis dataene skal hentes som et nyt lag"
+msgstr "Vælg om dataene skal hentes som et nyt lag"
 
 msgid "Download Location"
 msgstr "Download sted"
@@ -1444,7 +1444,7 @@ msgstr[1] ""
 "Der er mere end en vej, som bruger de punkter, du har valgt. Vælg også vejen."
 
 msgid "Which way segment should reuse the history of {0}?"
-msgstr "Hvilket vej segment bør genbruge historien fra {0}?"
+msgstr "Hvilket vej segment skal genbruge historien fra {0}?"
 
 msgid " [id: {0}]"
 msgstr " [id: {0}]"
@@ -4242,7 +4242,7 @@ msgid "{0}+{1}"
 msgstr "{0}+{1}"
 
 msgid "Number of lane dependent values inconsistent"
-msgstr "Antal lane afhængige værdier inkonsekvente"
+msgstr "Antal bane afhængige værdier inkonsekvente"
 
 msgid "Number of lane dependent values inconsistent in forward direction"
 msgstr "Antal af bane afhængige værdier inkonsekvent i fremad retning"
@@ -4293,7 +4293,7 @@ msgid "Area style way is not closed"
 msgstr "Område-stil vej er ikke lukket"
 
 msgid "No outer way for boundary"
-msgstr ""
+msgstr "Ingen ydre vej for grænse"
 
 msgid "No outer way for multipolygon"
 msgstr "Ingen ydre vej for multipolygon"
@@ -4358,7 +4358,7 @@ msgid "No useful role for multipolygon member"
 msgstr "Ingen brugbar rolle for multipolygon medlem"
 
 msgid "Non-Way in boundary"
-msgstr ""
+msgstr "Ikke-vej i grænse"
 
 msgid "Non-Way in multipolygon"
 msgstr "Ikke-vej i multipolygon"
@@ -5786,6 +5786,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Deres version ({0} indlæg)"
 msgstr[1] "Deres version ({0} indlæg)"
 
+msgid "My version (local dataset)"
+msgstr "Min version (lokalt datasæt)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Egenskaber i det sammenlagte elementer. De vil erstatte egenskaber i mine "
+"elementer når sammenlægningsbeslutninger er udført."
+
+msgid "Their version (server dataset)"
+msgstr "Deres version (serverens datasæt)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Egenskaber i deres datasæt, f.eks. server datasættet"
+
 msgid "My with Their"
 msgstr "Min med deres"
 
@@ -5873,28 +5892,6 @@ msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge løsnings kommando."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Egenskaber i det sammenlagte elementer. De vil erstatte egenskaber i mine "
-"elementer når sammenlægningsbeslutninger er udført."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Egenskaber i deres datasæt, f.eks. server datasættet"
-
-msgid "Coordinates:"
-msgstr "Koordinater:"
-
-msgid "Deleted State:"
-msgstr "Slettet status:"
-
-msgid "Referenced by:"
-msgstr "Reffereret af:"
-
 msgid "(none)"
 msgstr "ingen"
 
@@ -5904,6 +5901,15 @@ msgstr "slettet"
 msgid "not deleted"
 msgstr "ikke slettet"
 
+msgid "Deleted State:"
+msgstr "Slettet status:"
+
+msgid "Coordinates:"
+msgstr "Koordinater:"
+
+msgid "Referenced by:"
+msgstr "Reffereret af:"
+
 msgid "Keep my coordinates"
 msgstr "Behold mine koordinater"
 
@@ -5950,12 +5956,6 @@ msgstr "Nøgle"
 msgid "Value"
 msgstr "Værdi"
 
-msgid "My version (local dataset)"
-msgstr "Min version (lokalt datasæt)"
-
-msgid "Their version (server dataset)"
-msgstr "Deres version (serverens datasæt)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Behold de markerede nøgle/værdi par fra det lokale datasæt"
 
@@ -9764,19 +9764,19 @@ msgstr[0] "{0} objekt at slette:"
 msgstr[1] "{0} objekter at slette:"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Oprindelig projektion"
 
 msgid "Offset"
 msgstr "Forskydning"
 
 msgid "Tile download projection"
-msgstr ""
+msgstr "Tern download projektion"
 
 msgid "Tile display projection"
-msgstr ""
+msgstr "Tern visnings projektion"
 
 msgid "Current zoom"
-msgstr ""
+msgstr "Aktuelt zoom"
 
 msgid "Show tile info"
 msgstr "Vis info om tern"
@@ -9785,22 +9785,22 @@ msgid "Tile Info"
 msgstr "Tern info"
 
 msgid "Tile name"
-msgstr ""
+msgstr "Tern navn"
 
 msgid "Tile URL"
-msgstr ""
+msgstr "Tern URL"
 
 msgid "Tile size"
-msgstr ""
+msgstr "Tern størrelse"
 
 msgid "Tile display size"
-msgstr ""
+msgstr "Tern visnings størrelse"
 
 msgid "Reprojection"
-msgstr ""
+msgstr "Genprojektering"
 
 msgid "Reprojected tile size"
-msgstr ""
+msgstr "Genprojekterings tern størrelse"
 
 msgid "Metadata "
 msgstr "Metadata "
@@ -9927,10 +9927,10 @@ msgid "Id"
 msgstr "Id"
 
 msgid "Min. zoom"
-msgstr ""
+msgstr "Min. zoom"
 
 msgid "Max. zoom"
-msgstr ""
+msgstr "Maks. zoom"
 
 msgid "Unsupported imagery type: {0}"
 msgstr "Billedelagstype ikke understøttet: {0}"
@@ -10003,10 +10003,10 @@ msgid "Upload is discouraged"
 msgstr "Upload frarådes"
 
 msgid "Upload is blocked"
-msgstr ""
+msgstr "Upload er blokeret"
 
 msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
+msgstr "Konverter til GPX-lag"
 
 msgid "Converted from: {0}"
 msgstr "Konverteret fra: {0}"
@@ -10058,9 +10058,11 @@ msgid ""
 "Reprojecting layer {0} from {1} to {2}. For best image quality and "
 "performance, switch to one of the supported projections: {3}"
 msgstr ""
+"Genprojekterings lag {0} fra {1} til {2}. For den bedste billedkvalitet og "
+"ydeevne, skift til en af de understøttede projektioner: {3}"
 
 msgid "Unable to find supported projection for layer {0}. Using {1}."
-msgstr ""
+msgstr "Kan ikke finde understøttet projektion for lag {0}. Brug {1}."
 
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
@@ -10958,9 +10960,6 @@ msgstr "Luk dialogen og afbryd godkendelsen"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Luk dialogen og accepter adgangsudtrykket"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Kunne ikke afbryde igangværende OAuth handling"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Henter OAuth anmodningsudtryk fra ''{0}''"
 
@@ -11812,15 +11811,15 @@ msgstr "Gående"
 
 msgctxt "Heat map"
 msgid "User Normal"
-msgstr ""
+msgstr "Bruger normal"
 
 msgctxt "Heat map"
 msgid "User Light"
-msgstr ""
+msgstr "Bruger lys"
 
 msgctxt "Heat map"
 msgid "Traffic Lights"
-msgstr ""
+msgstr "Trafiklys"
 
 msgctxt "Heat map"
 msgid "Inferno"
@@ -11839,7 +11838,7 @@ msgid "Heat"
 msgstr "Varme"
 
 msgid "Use points instead of lines for heat map"
-msgstr ""
+msgstr "Brug punkter i stedet for linjer til heat map"
 
 msgid "Create markers when reading GPX"
 msgstr "Opret markører ved indlæsning af GPX"
@@ -11968,20 +11967,21 @@ msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
 msgid "Overlay gain adjustment"
-msgstr ""
+msgstr "Dæklags styrke justering"
 
 msgid "Lower limit of visibility"
-msgstr ""
+msgstr "Nedre grænse for synlighed"
 
 msgid "Adjust the gain of overlay blending."
-msgstr ""
+msgstr "Juster styrke af dæklags blanding."
 
 msgid "Draw all GPX traces that exceed this threshold."
-msgstr ""
+msgstr "Tegn alle GPX-spor der overstiger denne grænseværdi."
 
 msgid ""
 "Render engine uses points with simulated position error instead of lines. "
 msgstr ""
+"Korttegneren bruger punkter med simuleret positionsfejl i stedet for linjer. "
 
 msgid "Colors points and track segments by data limits."
 msgstr "Farvelægger punkter og sporsegmenter efter databegrænsninger."
@@ -12219,10 +12219,10 @@ msgid "Available default entries:"
 msgstr "Tilgængelige standardemner:"
 
 msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
-msgstr ""
+msgstr "Nye standardemner kan tilføjes i <a href=\"{0}\">Wiki</a>."
 
 msgid "Selected entries:"
-msgstr "Valgte elementer:"
+msgstr "Valgte emner:"
 
 msgid "Add a new {0} entry by entering the URL"
 msgstr "Opret et nyt {0} enme ved at indtaste dens URL"
@@ -12797,8 +12797,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Schweiz)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (uden lokale korrigeringer)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13490,7 +13490,7 @@ msgid "Unknown requisite: {0}"
 msgstr "Ukendt krav: {0}"
 
 msgid "Unknown regexp value: {0}"
-msgstr ""
+msgstr "Ukendt regexp værdi: {0}"
 
 msgid "Illegal member expression: {0}"
 msgstr "Ugyldig medlemsudtryk: {0}"
@@ -14045,7 +14045,7 @@ msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Starter forsøg {0} af {1} igen om {2} sekunder ..."
 
 msgid "OK - trying again."
-msgstr "OK - prøver igen"
+msgstr "OK - prøver igen."
 
 msgid "Starting retry {0} of {1}."
 msgstr "Starter forsøg {0} af {1} igen."
@@ -14185,10 +14185,18 @@ msgstr "Læsning blev annulleret"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+"Manglende obligatoriske attributter på element ''bounds''. Fik "
+"minlon=''{0}'', minlat=''{1}'', maxlon=''{2}'', maxlat=''{3}'', "
+"origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Manglende krævede attributter på elementet ''bounds''. Fik "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Ulovlig værdi for attributter ''lat'', ''lon'' på punkt med ID {0}. Fik "
+"''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Slettet vej {0} indeholder punkter"
@@ -15516,9 +15524,6 @@ msgstr "Åbner URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL indeholder ikke {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reserveret"
-
 msgid "Outdated Java version"
 msgstr "Forældet Java version"
 
@@ -15528,9 +15533,6 @@ msgstr "Opdater Java"
 msgid "You are running version {0} of Java."
 msgstr "Du bruger Java version {0}."
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15545,9 +15547,19 @@ msgstr ""
 "JOSM vil snart ikke virke med denne version; vi anbefaler dig meget at "
 "opdatere til Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+"Du kan blive udsat for kritiske Java-fejl; Vi anbefaler dig stærkt at "
+"opdatere til Java {0}."
+
 msgid "Would you like to update now ?"
 msgstr "Vil du opdatere nu?"
 
+msgid "reserved"
+msgstr "reserveret"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15871,11 +15883,11 @@ msgstr "landbrugsjord"
 
 msgctxt "landuse"
 msgid "farmyard"
-msgstr ""
+msgstr "landbrugsejendom"
 
 msgctxt "landuse"
 msgid "cemetery"
-msgstr ""
+msgstr "kirkegård"
 
 msgctxt "landuse"
 msgid "residential"
@@ -15891,15 +15903,15 @@ msgstr "område midt i by"
 
 msgctxt "landuse"
 msgid "quarry"
-msgstr ""
+msgstr "grusgrav/stenbrud"
 
 msgctxt "landuse"
 msgid "allotments"
-msgstr ""
+msgstr "kolonihaver"
 
 msgctxt "landuse"
 msgid "vineyard"
-msgstr ""
+msgstr "vingård"
 
 msgctxt "natural"
 msgid "scrub"
@@ -15915,23 +15927,23 @@ msgstr "græsland"
 
 msgctxt "natural"
 msgid "wetland"
-msgstr ""
+msgstr "vådområde"
 
 msgctxt "natural"
 msgid "heath"
-msgstr ""
+msgstr "hede"
 
 msgctxt "amenity"
 msgid "fire_station"
-msgstr ""
+msgstr "brandstation"
 
 msgctxt "leisure"
 msgid "park"
-msgstr ""
+msgstr "park"
 
 msgctxt "leisure"
 msgid "track"
-msgstr ""
+msgstr "bane"
 
 msgctxt "building"
 msgid "industrial"
@@ -16178,6 +16190,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "DigitalGlobe Premium Imagery"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "DigitalGlobe Standard Imagery"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16205,6 +16223,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Offentlige GPS-spor uploadet til OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
 
@@ -16235,6 +16256,9 @@ msgstr "Strava cycling and running heatmap"
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr "Shows major features to help orient you."
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -16283,24 +16307,38 @@ msgstr "OSM Inspector: Coastline (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+"Fairly clear up-to-date image for updating glacier edges (true color)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
-msgstr ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
+msgstr "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Argentina (TMS)"
@@ -16341,15 +16379,33 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM images for mapping: Heard Island coast"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Basemap of Austria, based on goverment data."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Orthofoto layer provided by basemap.at. "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16365,6 +16421,12 @@ msgstr "Tiris: DOM (Surface model)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: contour lines"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: orthophoto"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: orthophoto infrared"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16459,10 +16521,10 @@ msgid "SPW(allonie) 2009-2010 aerial imagery"
 msgstr "SPW(allonie) 2009-2010 aerial imagery"
 
 msgid "TEC bus lines"
-msgstr ""
+msgstr "TEC bus lines"
 
 msgid "TEC bus stops"
-msgstr ""
+msgstr "TEC bus stops"
 
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
@@ -16470,9 +16532,15 @@ msgstr "Benin: Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM images for mapping: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr "Patchy and partly cloudy coverage in usual sources (true color)"
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM images for mapping: Bouvet Island"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr "For more accurate coastline and glacier mapping (true color)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16482,6 +16550,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr "Addresses data from IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16566,9 +16637,36 @@ msgstr "Alagoas Litoral 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr "IBGE-BC250-Aglomerado Rural Isolado"
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr "IBGE-BC250-Pista de Pouso"
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr "IBGE-BC250-Rios Drenagem"
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Trecho Rodoviario"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr "IBGE-BC250-Terra Indigena"
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr "IBGE-BC250-Terra Publico (Militar)"
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr "IBGE-BC250-Unidade de Uso Sistentável - APA"
+
+msgid "IBGE-BC250-Villa"
+msgstr "IBGE-BC250-Villa"
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+
+msgid "IBGE-BCIM-Município"
+msgstr "IBGE-BCIM-Município"
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -16584,32 +16682,66 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Latest southwest British Columbia Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "High quality aerial imagery taken for the City of Kelowna"
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr "Coastline mostly mapped meanwhile (false color IR)"
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Image from after the 2014/2015 eruption (true color)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM images for mapping: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Image from after the 2015 eruption (true color)"
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -16628,14 +16760,14 @@ msgstr "Praha IPR latest orthophoto"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Praha IPR low-vegetation orthophoto"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Danmark)"
+msgid "SDFE aerial imagery"
+msgstr "SDFE luftfoto"
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen matrikelkort INSPIRE visning"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr "SDFE matrikelkort INSPIRE visning"
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr "SDFE DTK Kort25"
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -16643,22 +16775,36 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen skærmkort"
+msgid "SDFE Skærmkort"
+msgstr "SDFE Skærmkort"
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danmark)"
+msgid "Stevns"
+msgstr "Stevns"
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danmark)"
+msgid "Vejmidte"
+msgstr "Vejmidte"
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM images for mapping: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -16677,6 +16823,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "French address registry or Base Adresses Nationale"
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16689,6 +16838,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Matrikel"
 
+msgid "French land registry"
+msgstr "French land registry"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -16819,21 +16971,28 @@ msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
-
 msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
+
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Saxony latest aerial imagery"
@@ -16865,9 +17024,15 @@ msgstr "Munich latest aerial imagery 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM images for mapping: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr "Icebridge DMS image of the settlement - alignment might be poor"
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM images for mapping: Thule Air Base"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr "Icebridge DMS image - alignment might be poor"
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -16876,6 +17041,11 @@ msgstr ""
 "September 2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16890,15 +17060,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM images for mapping: Greenland mosaic"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr "Landsat mosaic of Greenland (true color)"
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr "Latest images north of the regular Landsat limit (true color)"
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -16959,18 +17149,41 @@ msgstr "Hillshade Hungary"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM images for mapping: Eastern Iceland"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr "Missing islets and inaccurate coast (true color)"
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM images for mapping: Rann of Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr "Missing in older pre-2011 images (true color)"
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM images for mapping: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr "Missing Islands in OSM (true color)"
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17034,18 +17247,31 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "South Tyrol Orthofoto 2011 (highres)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "South Tyrol Orthofoto 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr "Topographical basemap of South Tyrol"
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japan GSI ortho Imagery"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de OSM images for mapping: Mount Kenya 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr "Up-to-date image for glacier mapping (true color)"
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -17079,28 +17305,37 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm"
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr "LINZ NZ Aerial Imagery"
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr "LINZ NZ Topo50 Gridless Maps"
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "imagico.de OSM images for mapping: Svalbard mosaic"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
-msgstr ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
+msgstr "Sentinel-2 mosaic of Svalbard (true color)"
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de OSM images for mapping: Western Karakoram"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17110,15 +17345,31 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM images for mapping: Panama Canal"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr "Images of the new locks (but partly cloudy) (true color)"
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM images for mapping: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM images for mapping: New Ireland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de OSM images for mapping: Coropuna"
 
@@ -17127,8 +17378,11 @@ msgid ""
 msgstr ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr "Poor and outdated imagery in other sources (true color)"
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
-msgstr ""
+msgstr "Pangasinán/Bulacan (Philippines HiRes)"
 
 msgid "Geoportal 2: Ortofotomapa (aerial image)"
 msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17265,9 +17519,22 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de OSM images for mapping: Kerch Strait"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr "State of bridge construction in August 2016 (true color)"
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+"Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "imagico.de OSM images for mapping: Ushakov Island August 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr "Up-to-date late summer imagery with few clouds (true color)"
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
@@ -17275,18 +17542,18 @@ msgstr ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
-msgstr ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
+msgstr "Recent image showing newest features (true color)"
 
 msgid "Freemap.sk Car"
 msgstr "Freemap.sk Car"
@@ -17312,18 +17579,38 @@ msgstr "RABA-KGZ: Slovenia built-up areas"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "City of Cape Town 2013 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "City of Cape Town 2015 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr "Missing in other image sources (true color with estimated blue)"
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM images for mapping: Scott Island"
 
+msgid "Missing in other image sources (true color)"
+msgstr "Missing in other image sources (true color)"
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
 
@@ -17357,6 +17644,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de OSM images for mapping: Adams Bridge"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr "Supplementing incomplete coverage in other sources (true color)"
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17436,12 +17726,22 @@ msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (with Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr "The emap from Taiwan National Land Surveying and Mapping Center"
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Village Boundaries"
 
@@ -17477,6 +17777,9 @@ msgid ""
 "zooms, only changes since 2006 minus changes already incorporated into "
 "OpenStreetMap"
 msgstr ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -17489,6 +17792,9 @@ msgid ""
 "has a pixel resolution of 6 inches and is comprised of imagery flown in "
 "2010, 2012, 2013, and 2014"
 msgstr ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
 
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service roads"
@@ -17497,9 +17803,11 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM images for mapping: Alaska Range"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "NJ 2015 Aerial Imagery (Infrared)"
@@ -17507,6 +17815,7 @@ msgstr "NJ 2015 Aerial Imagery (Infrared)"
 msgid ""
 "Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
 msgstr ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
 
 msgid "NJ 2015 Aerial Imagery (Natural Color)"
 msgstr "NJ 2015 Aerial Imagery (Natural Color)"
@@ -17514,6 +17823,7 @@ msgstr "NJ 2015 Aerial Imagery (Natural Color)"
 msgid ""
 "Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
 msgstr ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
 
 msgid "San Juan Metro Area: 2013 USACE Orthophotos"
 msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
@@ -17525,6 +17835,8 @@ msgid ""
 "Public domain aerial imagery taken in May/June 2013 from San Juan County, "
 "WA. Resolution is 9 inch."
 msgstr ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
 
 msgid "WA 2016 aerial imagery for San Juan County"
 msgstr "WA 2016 aerial imagery for San Juan County"
@@ -17543,6 +17855,8 @@ msgid ""
 "Public domain street and address data from the San Juan County, WA. Updated "
 "at least quarterly."
 msgstr ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
 
 msgid "Texas Orthophoto"
 msgstr "Texas Orthophoto"
@@ -17554,7 +17868,7 @@ msgid "MD Latest 6 Inch Aerial Imagery"
 msgstr "MD Latest 6 Inch Aerial Imagery"
 
 msgid "Six Inch resolution aerial imagery for the State of Maryland"
-msgstr ""
+msgstr "Six Inch resolution aerial imagery for the State of Maryland"
 
 msgid "MD Three Inch Aerial Imagery"
 msgstr "MD Three Inch Aerial Imagery"
@@ -17563,6 +17877,8 @@ msgid ""
 "Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
 "Annapolis"
 msgstr ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
 
 msgid "MD Transportation Basemap"
 msgstr "MD Transportation Basemap"
@@ -17571,13 +17887,31 @@ msgid ""
 "Maryland State Highway Administration road features and additional Maryland "
 "focused landmarks"
 msgstr ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
 
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 Orthophotography"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 
@@ -17629,240 +17963,753 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr "Recent Landsat imagery"
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -17906,6 +18753,8 @@ msgid ""
 "Automatically assigns the address to a selected object in Austria. Data © "
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
+"Tildeler automatisk adressen til et valgt objekt i Østrig. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
 
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -17954,7 +18803,7 @@ msgstr ""
 "kommandoer. Se link til standard kommandoer (bue, cirkel osv.)"
 
 msgid "Tool for conflating data (matching and merging)."
-msgstr ""
+msgstr "Værktøj der sammensmelter data (matcher og sammenlægger)."
 
 msgid "Downloads new data when you pan/zoom"
 msgstr "Downloader nye data når du panorerer/zoomer"
@@ -18101,6 +18950,8 @@ msgid ""
 "Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
 "distances and angles."
 msgstr ""
+"Udvider Forøg vej-korrekthed tilstanden med hjælpere til at placere punkter "
+"med nøjagtige afstande og vinkler."
 
 msgid "This plugin simplifies the mapping and editing of indoor corridors."
 msgstr ""
@@ -18322,6 +19173,8 @@ msgid ""
 "Expand a simple intersection to a roundabout in gradual steps. Select an "
 "intersection node or a roundabout and press Crtl-Shift-R"
 msgstr ""
+"Udvid et enkelt skæringspunkt til en rundkørsel i trinvise step. Vælg et "
+"skæringspunkt eller en rundkørsel, og tryk på Ctrl-Shift-R"
 
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20091,38 +20944,38 @@ msgid "Dedicated Bridleway"
 msgstr "Dedikeret ridesti"
 
 msgid "Cycle Lane/Track"
-msgstr "Cykel-bane/spor"
+msgstr "Cykel-bane/sti"
 
 msgid "Cycleway"
 msgstr "Cykelsti"
 
 msgctxt "cycleway"
 msgid "lane"
-msgstr ""
+msgstr "bane"
 
 msgctxt "cycleway"
 msgid "track"
-msgstr ""
+msgstr "sti"
 
 msgctxt "cycleway"
 msgid "opposite_lane"
-msgstr ""
+msgstr "modsatte bane"
 
 msgctxt "cycleway"
 msgid "opposite_track"
-msgstr ""
+msgstr "modsatte sti"
 
 msgctxt "cycleway"
 msgid "opposite"
-msgstr ""
+msgstr "modsat"
 
 msgctxt "cycleway"
 msgid "share_busway"
-msgstr ""
+msgstr "delt busbane"
 
 msgctxt "cycleway"
 msgid "shared_lane"
-msgstr ""
+msgstr "delt bane"
 
 msgid "Cycleway left"
 msgstr "Cykelsti venstre"
@@ -21302,7 +22155,7 @@ msgid "Wash"
 msgstr "Vask"
 
 msgid "Self Service"
-msgstr ""
+msgstr "Selvbetjening"
 
 msgid "Car Dealer"
 msgstr "Bilforhandler"
@@ -21564,10 +22417,10 @@ msgid "UIC-Reference"
 msgstr "UIC-reference"
 
 msgid "Railway Halt"
-msgstr "Jernbane-stop"
+msgstr "Jernbanestop"
 
 msgid "Tram Stop"
-msgstr "Sporvogns-stop"
+msgstr "Sporvognsstop"
 
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -22581,7 +23434,7 @@ msgid "Shows humidity"
 msgstr "Viser fugtighed"
 
 msgid "Photo booth"
-msgstr ""
+msgstr "Fotoautomat"
 
 msgid "Recycling Container"
 msgstr "Genbrugscontainer"
@@ -24506,37 +25359,37 @@ msgid "Castle"
 msgstr "Borg"
 
 msgid "stately"
-msgstr ""
+msgstr "slot"
 
 msgid "defensive"
-msgstr ""
+msgstr "borg"
 
 msgid "fortress"
-msgstr ""
+msgstr "fæstning"
 
 msgid "manor"
-msgstr ""
+msgstr "herregård"
 
 msgid "palace"
-msgstr ""
+msgstr "palads"
 
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
 
 msgid "tumulus"
-msgstr ""
+msgstr "gravhøj"
 
 msgid "megalith"
-msgstr ""
+msgstr "megalit"
 
 msgid "fortification"
-msgstr ""
+msgstr "befæstning"
 
 msgid "settlement"
-msgstr ""
+msgstr "bebyggelse"
 
 msgid "necropolis"
-msgstr ""
+msgstr "nekropol"
 
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -24615,11 +25468,14 @@ msgid "Butcher"
 msgstr "Slagter"
 
 msgid "Seafood"
-msgstr "Fiskehandel"
+msgstr "Fiskehandler"
 
 msgid "Dairy"
 msgstr "Mejeriudsalg"
 
+msgid "Cheese"
+msgstr "Ostehandler"
+
 msgid "Deli (Fine Food)"
 msgstr "Delikatesse"
 
@@ -25592,7 +26448,7 @@ msgid "Land use"
 msgstr "Brug af land"
 
 msgid "Farmyard"
-msgstr "Gårdsplads"
+msgstr "Landbrugsejendom"
 
 msgid "Farmland"
 msgstr "Landbrugsjord"
@@ -26101,19 +26957,19 @@ msgid "Label point"
 msgstr "Etiketpunkt"
 
 msgid "Outline of building"
-msgstr ""
+msgstr "Omrids af bygningen"
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Indre segment"
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Tagryg"
 
 msgid "Roof edge"
-msgstr ""
+msgstr "Tagkant"
 
 msgid "Building level"
-msgstr ""
+msgstr "Bygningsetage"
 
 msgid "Site"
 msgstr "Sted"
@@ -26425,97 +27281,97 @@ msgid "Test"
 msgstr "Test"
 
 msgid "View website"
-msgstr ""
+msgstr "Vis hjemmeside"
 
 msgid "View URL"
-msgstr ""
+msgstr "Vis URL"
 
 msgid "Send Email"
-msgstr ""
+msgstr "Send email"
 
 msgid "View image"
-msgstr ""
+msgstr "Vis billede"
 
 msgid "View %name% article"
-msgstr ""
+msgstr "Vis %name% artikel"
 
 msgid "View Wikidata page"
-msgstr ""
+msgstr "Vis Wikidata side"
 
 msgid "View UNESCO sheet"
-msgstr ""
+msgstr "Vis UNESCO side"
 
 msgid "View %name% image"
-msgstr ""
+msgstr "Vis %name% billede"
 
 msgid "View %name% sheet of river"
-msgstr ""
+msgstr "Vis %name% side med flod"
 
 msgid "View %name% municipality sheet"
-msgstr ""
+msgstr "Vis %name% kommune side"
 
 msgid "View %name% sheet on osm.fr"
-msgstr ""
+msgstr "Vis %name% side på osm.fr"
 
 msgid "View %name% map of municipalities"
-msgstr ""
+msgstr "Vis %name% kort over kommuner"
 
 msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "Vis %name% liste over kommuner"
 
 msgid "View %name% map of cantons"
-msgstr ""
+msgstr "Vis %name% kort over kantoner"
 
 msgid "View %name% list of cantons"
-msgstr ""
+msgstr "Vis %name% liste over kantoner"
 
 msgid "View %name% map of arrondissements"
-msgstr ""
+msgstr "Vis %name% kort over distrikter"
 
 msgid "View %name% list of arrondissements"
-msgstr ""
+msgstr "Vis %name% liste over distrikter"
 
 msgid "View %name% map of departments"
-msgstr ""
+msgstr "Vis %name% kort over afdelinger"
 
 msgid "View %name% list of departments"
-msgstr ""
+msgstr "Vis %name% liste over afdelinger"
 
 msgid "View %name% map of regions"
-msgstr ""
+msgstr "Vis %name% kort over regioner"
 
 msgid "View %name% list of regions"
-msgstr ""
+msgstr "Vis %name% liste over regioner"
 
 msgid "View %name% sheet of church"
-msgstr ""
+msgstr "Vis %name% side med kirke"
 
 msgid "View Mérimée sheet of monument"
-msgstr ""
+msgstr "Vis Mérimée side med monument"
 
 msgid "View Mérimée list for this municipality"
-msgstr ""
+msgstr "Vis Mérimée liste for denne kommune"
 
 msgid "View %name% sheet of geodesic site"
-msgstr ""
+msgstr "Vis %name% side med geodætiske sted"
 
 msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "Vis UAI side med skole/kollegium"
 
 msgid "View %name% sheet of hospital/home"
-msgstr ""
+msgstr "Vis %name% side med sygehus/hjem"
 
 msgid "View explanation of %name% code"
-msgstr ""
+msgstr "Vis forklaring på %name% kode"
 
 msgid "Get identification card (pdf) for this establishment"
-msgstr ""
+msgstr "Få identitetskort (pdf) for dette foretagende"
 
 msgid "View %name% page of this post office"
-msgstr ""
+msgstr "Vis %name% side med dette postkontor"
 
 msgid "View %name% sheet of memorial"
-msgstr ""
+msgstr "Vis %name% side med mindesmærke"
 
 msgid "Even housenumber in odd address interpolation."
 msgstr "Lige husnummer i ulige adresse interpolation."
@@ -26737,7 +27593,7 @@ msgid "{0} on a node. Should be drawn as an area."
 msgstr "{0} på et punkt. Bør tegnes som et område."
 
 msgid "{0} on a node. Should be used in a relation"
-msgstr ""
+msgstr "{0} på et punkt. Bør bruges i en relation"
 
 msgid "{0} on a way. Should be used on a node."
 msgstr "{0} på en vej. Bør bruges på et punkt."
@@ -26818,7 +27674,7 @@ msgstr ""
 "{2} i stedet."
 
 msgid "node connects highway and building"
-msgstr ""
+msgstr "punkt forbinder vej og bygning"
 
 msgid "abbreviated street name"
 msgstr "forkortet gadenavn"
@@ -26918,6 +27774,9 @@ msgstr "{0} skal være et positivt heltal"
 msgid "unusual value of {0}"
 msgstr "usædvanlig værdi for {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr "{0} skal være en numerisk værdi, i meter og uden enheder"
+
 msgid "relation without type"
 msgstr "relation uden type"
 
@@ -26961,53 +27820,61 @@ msgid ""
 "wikipedia tag has no language given, use ''wikipedia''=''language:page "
 "title''"
 msgstr ""
+"wikipedia tag har ikke angivet noget sprog, brug "
+"''wikipedia''=''sprog:sidetitel''"
 
 msgid "wikipedia tag has an unknown language prefix"
-msgstr ""
+msgstr "wikipedia tag har et ukendt sprog præfiks"
 
 msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "wikipedia tag format er forældet"
 
 msgid "''wikipedia''=''language:page title''"
 msgstr "''wikipedia''=''sprog:sidetitel''"
 
 msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
-msgstr ""
+msgstr "wikipedia ''{0}'' sprog er forældet, brug ''{1}'' i stedet"
 
 msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
-msgstr ""
+msgstr "wikipedia ''{0}'' sprog er ugyldigt, brug ''{1}'' i stedet"
 
 msgid "{0} tag should not have URL-encoded values like ''%27''"
-msgstr ""
+msgstr "{0} tag bør ikke have URL-kodede værdier som ''%27''"
 
 msgid "wikipedia title should not start with a space after language code"
-msgstr ""
+msgstr "wikipedia titel bør ikke starte med et mellemrum efter sprogkoden"
 
 msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "wikipedia titel bør ikke have ''{0}'' præfiks"
 
 msgid "wikipedia page title should have first letter capitalized"
-msgstr ""
+msgstr "wikipedia sidetitel bør have første bogstav stort"
 
 msgid ""
 "wikipedia page title should have spaces instead of underscores (''_''→'' '')"
 msgstr ""
+"wikipedia sidetitel bør have mellemrum i stedet for understreger (''_''→'' "
+"'')"
 
 msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
-msgstr ""
+msgstr "wikipedia sprog synes at være duplikeret, f.eks. da:da:Foo"
 
 msgid "wikidata tag must be in Qnnnn format, where n is a digit"
-msgstr ""
+msgstr "wikidata tag skal være i Qnnnn format, hvor n er et ciffer"
 
 msgid ""
 "wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
 "help with wikidata id lookups"
 msgstr ""
+"wikipedia tag er sat, men der er ingen wikidata tag. Wikipedia udvidelse kan "
+"hjælpe med wikidata id opslag"
 
 msgid ""
 "wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
 "wikipedia=language:value together with wikidata tag."
 msgstr ""
+"wikipedia tag er ikke sat, men et ''{0}'' tag er. Sørg for at bruge "
+"wikipedia=sprog:værdi sammen med wikidata tag."
 
 msgid "Hide icons at low zoom"
 msgstr "Skjul ikoner ved lav zoom"
@@ -27922,6 +28789,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importer"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28893,6 +29763,29 @@ msgstr "Fejlfind"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Fejlfindingstilstand vil skrive billeder for hver behandlingstrin."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28902,6 +29795,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -29865,13 +30761,13 @@ msgid ""
 msgstr ""
 
 msgid "Simple Example"
-msgstr ""
+msgstr "Simpelt eksempel"
 
 msgid "Advanced Example"
-msgstr ""
+msgstr "Avanceret eksempel"
 
 msgid "<Please select data>"
-msgstr ""
+msgstr "<Vælg data>"
 
 msgid "Configure conflation settings"
 msgstr "Konfigurer sammensmeltnings indstillinger"
@@ -32689,7 +33585,7 @@ msgid "Problem occurred"
 msgstr "Problem opstået"
 
 msgid "Import World File Calibration..."
-msgstr ""
+msgstr "Importer verdens kalibrerings fil..."
 
 msgid "Loads calibration data from a world file"
 msgstr "Indlæser kalibrerings data fra en verdens fil"
@@ -32713,10 +33609,10 @@ msgid "Saving file failed: {0}"
 msgstr "Kunne ikke gemme fil: {0}"
 
 msgid "Export World file Calibration..."
-msgstr ""
+msgstr "Eksporter verdens kalibrerings fil..."
 
 msgid "Saves calibration data to a world file"
-msgstr ""
+msgstr "Gemmer kalibreringsdata til en verdensfil"
 
 msgid "New picture layer from clipboard"
 msgstr "Nyt billedlag fra udklipsholder"
@@ -33684,24 +34580,6 @@ msgstr "Skilt {0}"
 msgid "Additional sign {0}"
 msgstr "Yderligere skilt {0}"
 
-msgid "Edit relation"
-msgstr "Ret relation"
-
-msgid "Edit relations"
-msgstr "Ret relationer"
-
-msgid "No relation is selected"
-msgstr "Ingen relation er valgt"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Fjern punkt \"{0}\" på position {1} fra relation \"{2}\""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Fjern vej \"{0}\" på position {1} fra relation \"{2}\""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Fjern relation \"{0}\" på position {1} fra relation \"{2}\""
-
 msgid "routing active route"
 msgstr "ruteplan aktiv rute"
 
diff --git a/i18n/po/de.po b/i18n/po/de.po
index fb35573..f178810 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-28 14:56+0000\n"
-"Last-Translator: Dieter W. <geozeisig at versanet.de>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-25 20:36+0000\n"
+"Last-Translator: holger (lp) <Unknown>\n"
 "Language-Team: JOSM\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:46+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:47+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -5927,6 +5927,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Deren Version ({0} Eintrag)"
 msgstr[1] "Deren Version ({0} Einträge)"
 
+msgid "My version (local dataset)"
+msgstr "Meine Version (lokale Daten)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Eigenschaften des vereinigten Elements. Diese werden die Eigenschaften des "
+"eigenen Elements ersetzen, wenn die Vereinigung angewendet wird."
+
+msgid "Their version (server dataset)"
+msgstr "Deren Version (Serverdaten)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)"
+
 msgid "My with Their"
 msgstr "Meine mit Deren"
 
@@ -6015,28 +6034,6 @@ msgstr ""
 "Vereinigte Punkte sind noch nicht fixiert. Konfliktlösung kann nicht "
 "ausgeführt werden."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Eigenschaften des vereinigten Elements. Diese werden die Eigenschaften des "
-"eigenen Elements ersetzen, wenn die Vereinigung angewendet wird."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)"
-
-msgid "Coordinates:"
-msgstr "Koordinaten:"
-
-msgid "Deleted State:"
-msgstr "Löschstatus:"
-
-msgid "Referenced by:"
-msgstr "Referenziert durch:"
-
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -6046,6 +6043,15 @@ msgstr "gelöscht"
 msgid "not deleted"
 msgstr "nicht gelöscht"
 
+msgid "Deleted State:"
+msgstr "Löschstatus:"
+
+msgid "Coordinates:"
+msgstr "Koordinaten:"
+
+msgid "Referenced by:"
+msgstr "Referenziert durch:"
+
 msgid "Keep my coordinates"
 msgstr "Behalte meine Koordinaten"
 
@@ -6093,12 +6099,6 @@ msgstr "Schlüssel"
 msgid "Value"
 msgstr "Wert"
 
-msgid "My version (local dataset)"
-msgstr "Meine Version (lokale Daten)"
-
-msgid "Their version (server dataset)"
-msgstr "Deren Version (Serverdaten)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten."
@@ -10587,7 +10587,7 @@ msgid "Error on file {0}"
 msgstr "Fehler bei Datei {0}"
 
 msgid "Display geotagged images"
-msgstr "Stelle georefernzierte Bilder dar"
+msgstr "Stelle georeferenzierte Bilder dar"
 
 msgid "Previous"
 msgstr "Vorheriges"
@@ -11263,9 +11263,6 @@ msgstr "Dialog schließen und Autorisierung abbrechen"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Dialog schließen und Zugriffskennung annehmen"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Abbruch der laufenden OAuth-Anfrage fehlgeschlagen"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "OAuth-Anfragekennung von ''{0}'' abrufen"
 
@@ -13175,8 +13172,8 @@ msgstr "PUWG-Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swissgrid (Schweiz)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (ohne lokale Korrekturen)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14017,7 +14014,7 @@ msgid "Right click = copy to clipboard"
 msgstr "Rechtsklick = in Zwischenablage kopieren"
 
 msgid "Missing mandatory attribute ''{0}''."
-msgstr "notwendiges Attribut \"{0}\" fehlt"
+msgstr "Notwendiges Attribut \"{0}\" fehlt."
 
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
@@ -14570,8 +14567,7 @@ msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "Unzulässiger numerischer Wert ''{1}'' für Attribut ''{0}''."
 
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
-"Notwendiges Attribut ''{0}'' für das XML-Element {1} ist nicht vorhanden."
+msgstr "Notwendiges Attribut ''{0}'' für das XML-Element {1} fehlt."
 
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
 msgstr "Undefiniertes Element \"{0}\" im Eingabestrom gefunden. Abbruch."
@@ -14625,16 +14621,24 @@ msgstr "Lesevorgang wurde abgebrochen"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+"Notwendige Attribute des Elements ''bounds'' (Bereichsgrenzen) fehlen. "
+"Erhielt minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', "
+"origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Notwendiges Attribut des XML-Elements ''bounds'' fehlt. Erhielt "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Attribute ''lat'', ''lon'' an Punkt mit ID {0} haben den ungültigen Wert "
+"''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Die gelöschte Linie {0} enthält Punkte"
 
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> der Linie {1}"
+msgstr "Notwendiges Attribut \"{0}\" auf <nd> der Linie {1} fehlt."
 
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element <nd>."
@@ -15119,7 +15123,8 @@ msgstr ""
 
 msgid "missing mandatory attribute ''index'' for element ''layer''"
 msgstr ""
-"Fehlende verbindliche Eigenschaft ''index'' für das Element ''layer''"
+"notwendiges Attribut ''index'' (Index) für das Element ''layer'' (Ebene) "
+"fehlt"
 
 msgid "unexpected format of attribute ''index'' for element ''layer''"
 msgstr ""
@@ -15133,10 +15138,12 @@ msgid "missing layer with index {0}"
 msgstr "Ebene mit Index {0} fehlt"
 
 msgid "missing mandatory attribute ''name'' for element ''layer''"
-msgstr "Fehlende verbindliche Eigenschaft ''name'' für das Element ''layer''"
+msgstr ""
+"notwendiges Attribut ''name'' (Name) für das Element ''layer'' (Ebene) fehlt"
 
 msgid "missing mandatory attribute ''type'' for element ''layer''"
-msgstr "Fehlende verbindliche Eigenschaft ''type'' für das Element ''layer''"
+msgstr ""
+"notwendiges Attribut ''type'' (Typ) für das Element ''layer'' (Ebene) fehlt"
 
 msgid "Unable to load layer"
 msgstr "Ebene kann nicht geladen werden"
@@ -16017,9 +16024,6 @@ msgstr "Öffne URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL enthält nicht {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reserviert"
-
 msgid "Outdated Java version"
 msgstr "Veraltete Java-Version"
 
@@ -16029,9 +16033,6 @@ msgstr "Java aktualisieren"
 msgid "You are running version {0} of Java."
 msgstr "Sie verwenden die Java-Version {0}"
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -16046,9 +16047,19 @@ msgstr ""
 "JOSM wird mit dieser Version bald nicht mehr funktionieren; wir empfehlen "
 "eindringlich eine Aktualisierung auf Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+"Sie könnten mit kritischen Java-Fehlern konfrontiert werden. Wir empfehlen "
+"Ihnen, auf Java {0} zu aktualisieren."
+
 msgid "Would you like to update now ?"
 msgstr "Möchten Sie jetzt die Aktualisierung durchführen?"
 
+msgid "reserved"
+msgstr "reserviert"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16691,6 +16702,12 @@ msgstr "HDM (Humanitäres OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellitenbild"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "DigitalGlobe Premium Luftbilder"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "DigitalGlobe Standard Luftbilder"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16718,6 +16735,9 @@ msgstr "OpenStreetMap (Deutscher Stil)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS-Spuren"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Öffentliche GPS-Spuren auf OpenStreetMap hochgeladen."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Öffentlicher Personennahverkehr (ÖPNV)"
 
@@ -16748,6 +16768,10 @@ msgstr "Strava Radfahr- und Laufsport-Heatmap"
 msgid "Locator Overlay"
 msgstr "Positionsanzeiger-Einblendung"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+"Zeigt die wichtigsten Funktionen an, um Ihnen bei der Orientierung zu helfen."
+
 msgid "QA No Address"
 msgstr "Qualitätssicherung keine Adressen"
 
@@ -16797,11 +16821,23 @@ msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Albanische Alpen (Prokletije)"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Bildmaterial vom Spätsommer, wo übliche Quellen durch Wolken und Schnee "
+"stark eingeschränkt sind (Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Südliches Transantarktisches "
 "Gebirge"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM Bilder für die Kartierung: Pensacola Mountains"
 
@@ -16809,12 +16845,15 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Elephant Island/Clarence Island"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+"Ziemlich klare aktuelle Bilder für die Aktualisierung der Gletscherkanten "
+"(Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16857,15 +16896,30 @@ msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Nordwestlicher Teil der Insel Heard"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM Bilder für die Kartierung: Küste Insel Heard"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Basiskarte von Österreich, basierend auf Regierungsdaten."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Orthofoto-Ebene bereitgestellt von basemap.at. "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16881,6 +16935,12 @@ msgstr "Tiris: DOM (Oberflächenmodell)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: Höhenlinien"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: Orthofoto"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: Orthofoto Infrarot"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Wien: Mehrzweckkarte"
 
@@ -16988,9 +17048,15 @@ msgstr "Benin: Großraum Cotonou 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM Bilder für die Kartierung: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM Bilder für die Kartierung: Bouvetinsel"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr "Für genauere Küsten- und Gletscherkartierung (Echtfarben)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Karte der Stadtgebiete"
 
@@ -17001,6 +17067,9 @@ msgid "IBGE Distrito Federal"
 msgstr ""
 "IBGE (Brasilianisches Institut für Geografie und Statistik) Bundesdistrikt"
 
+msgid "Addresses data from IBGE"
+msgstr "Adressdaten von IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio de Janeiro 2013"
 
@@ -17085,9 +17154,36 @@ msgstr "Küste Alagoas 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Trecho Rodoviario"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobasis Hydrografie"
 
@@ -17103,9 +17199,16 @@ msgstr "Britisch-Kolumbien Luftbildplan"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Neuestes südwestliches British Columbia Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "Hochwertige Luftbilder für die Stadt Kelowna"
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna-Straßeneinblendung"
 
@@ -17113,23 +17216,49 @@ msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Östliche Küste Devon Island"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr "Inzwischen zum Großteil kartierte Küste (Falschfarbe Infrarot)"
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM Bilder für die Kartierung: Nördliche Ellesmere-Insel"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Zusammengestellt aus ASTER Luftbildern von Juli 2012 (Echtfarben mit "
+"berechnetem Blau)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Nördliche Ellesmere-Insel Juli 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Zusammengestellt aus ASTER Luftbildern von Juli 2016 (Echtfarben mit "
+"berechnetem Blau)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM Bilder für die Kartierung: Fogo, Kap Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Bild von nach dem Ausbruch 2014/2015 (Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM Bilder für die Kartierung: Insel Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM Bilder für die Kartierung: Vulkan Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Bild von nach dem Ausbruch 2015 (Echtfarben)"
+
 msgid "Czech CUZK:KM"
 msgstr "Tschechisches CUZK:KM"
 
@@ -17148,14 +17277,14 @@ msgstr "Prag IPR neuestes Orthofoto"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Prag IPR niedrige Vegetation Orthofoto"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatenbehörde (Dänemark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatenbehörde Flurstücke INSPIRE-Ansicht"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatenbehörde DTK-Karte25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Gelände Schattenkarte (40 cm)"
@@ -17163,22 +17292,32 @@ msgstr "SDFE Gelände Schattenkarte (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Oberfläche Schattenkarte (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatenbehörde Bildschirmkarte"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dänemark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dänemark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM Bilder für die Kartierung: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Inseln Darwin und Wolf, Galapagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estland Basiskarte (Maaamet)"
 
@@ -17197,6 +17336,9 @@ msgstr "Estland Forstwirtschaft (Maaamet)"
 msgid "BANO"
 msgstr "BANO (Französische Adressen unter offener Lizenz)"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "Französisches Adressregister oder Nationale Basisadressen"
+
 msgid "BD Carthage"
 msgstr "BD Carthage (französisches Flussnetz)"
 
@@ -17209,6 +17351,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Kataster"
 
+msgid "French land registry"
+msgstr "Französisches Grundbuchamt"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17340,20 +17485,25 @@ msgstr ""
 "Watt"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Nördliches deutsches Westküsten-"
 "Watt (Infrarot)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM-Bilder zum Kartieren: Nordseeküste 2016"
-
 msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM-Bilder zum Kartieren: Nordseeküste 2016"
+
 msgid "Saxony latest aerial imagery"
 msgstr "Sachsen neuestes Luftbild"
 
@@ -17384,9 +17534,15 @@ msgstr "München neuestes Luftbild 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM Bilder für die Kartierung: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM Bilder für die Kartierung: Thule Air Base"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17395,6 +17551,10 @@ msgstr ""
 "niedriger Höhe September 2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17410,19 +17570,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM Bilder für die Kartierung: Grönland"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr "Landsat-Mosaik von Grönland (Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Mai 2013 seitlich aufgenommen (off-"
 "nadir) Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Landsat seitlich aufgenommen (off-"
 "nadir) Juli 2016"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM Bilder für die Kartierung: Nördliches Grönland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+"Zusammengestellt hauptsächlich aus ASTER Luftbildern von 2012, einige Bilder "
+"von 2005 im Nordosten (Echtfarben mit berechnetem Blau)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Dronenbilder (Haiti)"
 
@@ -17483,18 +17661,37 @@ msgstr "Schummerung Ungarn"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM Bilder für die Kartierung: Östliches Island"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM Bilder für die Kartierung: Rann von Kachchh"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM Bilder für die Kartierung: Südöstliches Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM Bilder für die Kartierung: Bakun-Stausee"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr "In älteren Bildern vor 2011 fehlend (Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM Bilder für die Kartierung: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr "Fehlende Inseln in OSM (Echtfarben)"
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17558,18 +17755,30 @@ msgstr "Südtirol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Südtirol Orthofoto 2011 (hochaufgelöst)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+"Orthofoto von Südtirol von 2011 mit bis zu 20 cm Auflösung (größere Täler)"
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Südtirol Orthofoto 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Südtirol Topokarte"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr "Topografische Basiskarte von Südtirol"
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japan GSI Luftbild"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de OSM Bilder für die Kartierung: Mount-Kenya-Massiv 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr "Aktuelles Bild für Gletscher-Kartierung (Echtfarben)"
+
 msgid "USSR - Latvia"
 msgstr "UdSSR - Lettland"
 
@@ -17603,27 +17812,36 @@ msgstr "Luxemburg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Nigerdelta Okt 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK Luftbild 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK Luftbild 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Spitzbergen - Orthofoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "imagico.de OSM-Bilder zum Kartieren: Spitzbergen-Mosaik"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Westliches Karakorum-Gebirge"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gazastreifen - Pléiades - 2014/07/06"
 
@@ -17634,15 +17852,29 @@ msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Panamakanal - pazifische Seite"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM Bilder für die Kartierung: Panamakanal"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM Bilder für die Kartierung: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM Bilder für die Kartierung: Neuirland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de OSM Bilder für die Kartierung: Coropuna"
 
@@ -17652,6 +17884,9 @@ msgstr ""
 "imagico.de OSM-Bilder für die Kartierung: Vilcanota-Kordillere und Quelccaya-"
 "Eiskappe"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr "Pangasinán/Bulacan (Philippinen hochaufgelöst)"
 
@@ -17790,9 +18025,21 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de OSM Bilder für die Kartierung: Straße von Kertsch"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr "In Bau befindliche Brücke im August 2016 (Echtfarben)"
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM-Bilder zum Kartieren: Petschoraseeküste"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "imagico.de OSM Bilder für die Kartierung: Uschakow-Insel August 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr "Aktuelle Spätsommerbilder mit wenigen Wolken (Echtfarben)"
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
@@ -17800,15 +18047,17 @@ msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Nördlicher und polarer Ural August "
 "2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+"Aktuelle Spätsommerbilder mit wenigen Wolken - Achtung: Nicht jeder "
+"sichtbare Schnee gehört zu Gletschern (Echtfarben)"
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "imagico.de OSM Bilder für die Kartierung: Kosmodrom Wostotschny"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM-Bilder zum Kartieren: Petschoraseeküste"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17835,18 +18084,34 @@ msgstr "RABA-KGZ: Slowenien - bebaute Gebiete"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Stadt Kapstadt 2013 Luftbilder"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Stadt Kapstadt 2015 Luftbilder"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial (Luftbild)"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM Bilder für die Kartierung: Scott-Insel"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island Landsat"
 
@@ -17880,6 +18145,9 @@ msgstr "GRAFCAN Express - Kanarische Inseln"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de OSM Bilder für die Kartierung: Adamsbrücke"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17960,12 +18228,20 @@ msgstr ""
 "imagico.de OSM Bilder für die Kartierung: Zentrale Alpen später September "
 "2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (mit Höhenlinie)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Dorfgrenzen"
 
@@ -18021,8 +18297,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM Bilder für die Kartierung: Alaskakette"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -18099,9 +18375,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 Orthofoto"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM Bilder für die Kartierung: Ruwenzori-Gebirge"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "imagico.de OSM Bilder für die Kartierung: Ruwenzori-Gebirge 2016"
 
@@ -18154,240 +18441,771 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Stadtpläne, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Aberdeen 1866-1867, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Stadtpläne, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Airdrie 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Stadtpläne, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Alexandria 1859, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Stadtpläne, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Alloa 1861-1862, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Stadtpläne, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Annan 1859, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Stadtpläne, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Arbroath 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Stadtpläne, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Ayr 1855, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Stadtpläne, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Berwick-upon-Tweed 1852, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Stadtpläne, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Brechin 1862, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Stadtpläne, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Burntisland 1894, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Stadtpläne, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Campbelton 1865, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Stadtpläne, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Coatbridge 1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Stadtpläne, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Cupar 1854, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Stadtpläne, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Cupar 1893-1894, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Stadtpläne, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dalkeith 1852, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Stadtpläne, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dalkeith 1893, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Stadtpläne, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dumbarton 1859, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Stadtpläne, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dumfries 1850, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Stadtpläne, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dumfries 1893, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Stadtpläne, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dundee 1857-1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Stadtpläne, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dundee 1870-1872, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Stadtpläne, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dunfermline 1854, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Stadtpläne, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Dunfermline 1894, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Stadtpläne, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Edinburgh 1849-1851, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Stadtpläne, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Edinburgh 1876-1877, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Stadtpläne, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Edinburgh 1893-1894, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Stadtpläne, Edinburgh 1940er-1960er (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Edinburgh 1940ger-1960ger, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Stadtpläne, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Elgin 1868, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Stadtpläne, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Falkirk 1858-1859, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Stadtpläne, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Forfar 1860-1861, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Stadtpläne, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Forres 1868, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Stadtpläne, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Galashiels 1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Stadtpläne, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Girvan 1857, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Stadtpläne, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Glasgow 1857-1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Stadtpläne, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Glasgow 1892-1894, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Stadtpläne, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Greenock 1857, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Stadtpläne, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Haddington 1853, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Stadtpläne, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Haddington 1893, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Stadtpläne, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Hamilton 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Stadtpläne, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Hawick 1857-1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Stadtpläne, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Inverness 1867-1868, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Stadtpläne, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Irvine 1859, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Stadtpläne, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Jedburgh 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Stadtpläne, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kelso 1857, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Stadtpläne, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kilmarnock 1857-1859, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Stadtpläne, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirkcaldy 1855, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Stadtpläne, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirkcaldy 1894, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Stadtpläne, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirkcudbright 1850, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Stadtpläne, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirkcudbright 1893, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Stadtpläne, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirkintilloch 1859, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Stadtpläne, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Kirriemuir 1861, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Stadtpläne, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Lanark 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Stadtpläne, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Linlithgow 1856, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Stadtpläne, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Mayole 1856-1857, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Stadtpläne, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Montrose 1861-1862, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Stadtpläne, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Musselburgh 1853, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Stadtpläne, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Musselburgh 1893, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Stadtpläne, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Nairn 1867-1868, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Stadtpläne, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Oban 1867-1868, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Stadtpläne, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Paisley 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Stadtpläne, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Peebles 1856, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Stadtpläne, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Perth 1860, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Stadtpläne, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Peterhead 1868, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Stadtpläne, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Port Glasgow 1856-1857, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Stadtpläne, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Portobello 1893-1894, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Stadtpläne, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Rothesay 1862-1863, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Stadtpläne, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Selkirk 1865, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Stadtpläne, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von St Andrews 1854, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Stadtpläne, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von St Andrews 1893, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Stadtpläne, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Stirling 1858, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Stadtpläne, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Stonehaven 1864, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Stadtpläne, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Stranraer 1847, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Stadtpläne, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Stranraer 1863-1877, mit freundlicher "
+"Genehmigung der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Stadtpläne, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Stranraer 1893, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Stadtpläne, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Strathaven 1858, mit freundlicher Genehmigung "
+"der Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Stadtpläne, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Wick 1872, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Stadtpläne, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Wigtown 1848, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Stadtpläne, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+"Detaillierter Stadtplan von Wigtown 1894, mit freundlicher Genehmigung der "
+"Schottischen Nationalbibliothek."
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -25184,6 +26002,9 @@ msgstr "Fischhändler"
 msgid "Dairy"
 msgstr "Milchgeschäft"
 
+msgid "Cheese"
+msgstr "Käse"
+
 msgid "Deli (Fine Food)"
 msgstr "Feinkost"
 
@@ -27503,6 +28324,9 @@ msgstr "{0} muss eine positive Ganzzahl sein"
 msgid "unusual value of {0}"
 msgstr "ungewöhnlicher Wert von {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr "{0} muss ein numerischer Wert sein, in Metern und ohne Einheiten"
+
 msgid "relation without type"
 msgstr "Relation ohne Typ"
 
@@ -27704,7 +28528,8 @@ msgstr "Fehlende Definition zu neuem Objekt mit der id {0}."
 
 msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
 msgstr ""
-"Fehlendes Pflichtfeldattribut ''{0}'' bei <member> aus der Relation {1}."
+"Notwendiges Attribut ''{0}'' bei <member> (Mitglied) aus der Relation {1} "
+"fehlt."
 
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
@@ -28524,41 +29349,46 @@ msgid "Go forward"
 msgstr "Vorwärts gehen"
 
 msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Welche Bildebenen möchten Sie in die Mapillary-Ebene importieren?"
 
 msgid "Import"
 msgstr "Importieren"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+"Konnte ein georeferenziertes Bild nicht in die Mapillary-Ebene importieren!"
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
+"Von welcher Quelle möchten Sie Bilder auf die Mapillary-Ebene importieren?"
 
 msgid "There are currently no layers with geotagged images!"
-msgstr ""
+msgstr "There are currently no layers with geotagged images!"
 
 msgid "Images from my file system"
-msgstr ""
+msgstr "Bilder von meinem Dateisystem"
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Wählen Sie die Bilder aus, die Sie importieren möchten"
 
 msgid "All images in a directory"
-msgstr ""
+msgstr "Alle Bilder in einem Verzeichnis"
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Wählen Sie das Verzeichnis zum Importieren von Bildern aus"
 
 msgid "From existing image layer"
-msgstr ""
+msgstr "Von vorhandener Bildebene"
 
 msgid "Import exception"
-msgstr ""
+msgstr "Importausnahme"
 
 msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Bild ''{0}'' konnte nicht importiert werden!"
 
 msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "Verzeichnis ''{0}'' konnte nicht importiert werden!"
 
 msgid ""
 "A tag with key <i>{0}</i> is already present on the selected OSM object."
@@ -29531,6 +30361,29 @@ msgstr ""
 "Im Fehleranalysemodus wird ein Bild für jeden Bearbeitungsschritt "
 "geschrieben."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr "Adressen holen"
 
@@ -29540,6 +30393,9 @@ msgstr "Adresshelfer Österreich<br>Bitte genau ein Objekt auswählen."
 msgid "Austria Address Helper"
 msgstr "Österreich-Adresshelfer"
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr "Adresse erfolgreich zum ausgewählten Objekt hinzugefügt:"
 
@@ -34421,24 +35277,6 @@ msgstr "Zeichen {0}"
 msgid "Additional sign {0}"
 msgstr "Zusatzzeichen {0}"
 
-msgid "Edit relation"
-msgstr "Relation bearbeiten"
-
-msgid "Edit relations"
-msgstr "Relationen bearbeiten"
-
-msgid "No relation is selected"
-msgstr "Es ist keine Relation ausgewählt"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Punkt \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Linie \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Relation \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
-
 msgid "routing active route"
 msgstr "Routing: Aktive Route"
 
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 58db5bb..72f46f0 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-07-10 12:32+0000\n"
 "Last-Translator: ralekuja <Unknown>\n"
 "Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:17+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:18+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5400,6 +5400,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5482,33 +5499,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5556,12 +5562,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10125,9 +10125,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11824,7 +11821,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13093,7 +13090,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14210,9 +14212,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14222,9 +14221,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14235,9 +14231,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14823,6 +14827,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14850,6 +14860,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14880,6 +14893,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14928,21 +14944,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14984,15 +15011,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15008,6 +15050,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15113,9 +15161,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15125,6 +15179,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15209,9 +15266,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15227,31 +15311,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15270,13 +15383,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15285,21 +15398,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15318,6 +15441,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15330,6 +15456,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15457,16 +15586,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15499,15 +15633,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15519,15 +15663,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15588,18 +15748,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15663,18 +15842,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15708,26 +15898,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15737,15 +15936,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15753,6 +15966,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15891,23 +16107,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15934,18 +16162,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15979,6 +16223,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16057,12 +16304,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16118,8 +16373,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16143,345 +16398,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23067,6 +23708,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25312,6 +25956,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26284,6 +26931,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27136,6 +27786,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27145,6 +27818,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31686,24 +32362,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 3b21de9..92a0b71 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-01-25 09:17+0000\n"
 "Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
 "Language-Team: Greek <el at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:48+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:49+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: el\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5608,6 +5608,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr "Η έκδοσή μου (τοπικό σύνολο δεδομένων)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr "Η έκδοσή τους (συνολο δεδομένων διακομιστή)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr "Δικό μου με Δικό τους"
 
@@ -5690,35 +5707,24 @@ msgstr "Κόμβος"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgid "(none)"
+msgstr "(κανένα)"
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
+msgid "deleted"
+msgstr "διαγράφηκε"
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "not deleted"
+msgstr "μη διεγραμένο"
+
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "Συντεταγμένες:"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr "(κανένα)"
-
-msgid "deleted"
-msgstr "διαγράφηκε"
-
-msgid "not deleted"
-msgstr "μη διεγραμένο"
-
 msgid "Keep my coordinates"
 msgstr "Διατήρηση των συντεταγμένων μου"
 
@@ -5764,12 +5770,6 @@ msgstr "Κλειδί"
 msgid "Value"
 msgstr "Τιμή"
 
-msgid "My version (local dataset)"
-msgstr "Η έκδοσή μου (τοπικό σύνολο δεδομένων)"
-
-msgid "Their version (server dataset)"
-msgstr "Η έκδοσή τους (συνολο δεδομένων διακομιστή)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10440,9 +10440,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12163,8 +12160,8 @@ msgstr "Ζώνη PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Ελβετικό πλέγμα (Ελβετία)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (χωρίς τοπικές διορθώσεις)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Γουαδελούπη Fort-Marigot 1949"
@@ -13446,7 +13443,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14591,9 +14593,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14603,9 +14602,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14616,9 +14612,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15204,6 +15208,12 @@ msgstr "HDM (Ανθρωπιστική Ομάδα OpenStreetMap)"
 msgid "Mapbox Satellite"
 msgstr "Δορυφόρος MapBox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -15231,6 +15241,9 @@ msgstr "OpenStreetMap (γερμανικό στιλ)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "Ίχνη GPS OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Δημόσια συγκοινωνία (ÖPNV)"
 
@@ -15261,6 +15274,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA καμία διεύθυνση"
 
@@ -15309,21 +15325,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15365,15 +15392,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15389,6 +15431,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15494,9 +15542,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15506,6 +15560,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15590,9 +15647,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15608,31 +15692,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15651,13 +15764,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15666,21 +15779,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15699,6 +15822,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15711,6 +15837,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15838,16 +15967,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15880,15 +16014,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15900,15 +16044,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15969,18 +16129,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16044,18 +16223,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16089,26 +16279,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16118,15 +16317,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16134,6 +16347,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16272,23 +16488,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16315,18 +16543,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16360,6 +16604,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16438,12 +16685,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16499,8 +16754,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16524,345 +16779,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23451,6 +24092,9 @@ msgstr "Ιχθυοπωλείο"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Ντελικατέσεν (εκλεκτά προϊόντα)"
 
@@ -25696,6 +26340,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26670,6 +27317,9 @@ msgstr ""
 msgid "Import"
 msgstr "Εισαγωγή"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27524,6 +28174,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27533,6 +28206,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32100,24 +32776,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Επεξεργασία σχέσης"
-
-msgid "Edit relations"
-msgstr "Επεξεργασία σχέσεων"
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Αφαίρεση κόμβου ''{0}'' στη θέση {1} από τη σχέση ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index f0345d5..f67ff27 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-06-08 12:52+0000\n"
 "Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
 "Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:15+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5715,6 +5715,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Their version ({0} entry)"
 msgstr[1] "Their version ({0} entries)"
 
+msgid "My version (local dataset)"
+msgstr "My version (local dataset)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Properties in my dataset, i.e. the local dataset"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+
+msgid "Their version (server dataset)"
+msgstr "Their version (server dataset)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Properties in their dataset, i.e. the server dataset"
+
 msgid "My with Their"
 msgstr "My with Their"
 
@@ -5800,28 +5819,6 @@ msgstr "Node"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Merged nodes not frozen yet. Cannot build resolution command."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Properties in my dataset, i.e. the local dataset"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Properties in their dataset, i.e. the server dataset"
-
-msgid "Coordinates:"
-msgstr "Coordinates:"
-
-msgid "Deleted State:"
-msgstr "Deleted State:"
-
-msgid "Referenced by:"
-msgstr "Referenced by:"
-
 msgid "(none)"
 msgstr "(none)"
 
@@ -5831,6 +5828,15 @@ msgstr "deleted"
 msgid "not deleted"
 msgstr "not deleted"
 
+msgid "Deleted State:"
+msgstr "Deleted State:"
+
+msgid "Coordinates:"
+msgstr "Coordinates:"
+
+msgid "Referenced by:"
+msgstr "Referenced by:"
+
 msgid "Keep my coordinates"
 msgstr "Keep my coordinates"
 
@@ -5876,12 +5882,6 @@ msgstr "Key"
 msgid "Value"
 msgstr "Value"
 
-msgid "My version (local dataset)"
-msgstr "My version (local dataset)"
-
-msgid "Their version (server dataset)"
-msgstr "Their version (server dataset)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Keep the selected key/value pairs from the local dataset"
 
@@ -10835,9 +10835,6 @@ msgstr "Close the dialogue and cancel authorisation"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Close the dialogue and accept the Access Token"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Failed to cancel running OAuth operation"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Retrieving OAuth Request Token from ''{0}''"
 
@@ -12610,7 +12607,7 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13936,7 +13933,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -15132,9 +15134,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -15144,9 +15143,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15157,9 +15153,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15754,6 +15758,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15781,6 +15791,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15811,6 +15824,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15859,21 +15875,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15915,15 +15942,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15939,6 +15981,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16044,9 +16092,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -16056,6 +16110,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16140,9 +16197,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16158,31 +16242,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16201,13 +16314,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16216,21 +16329,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16249,6 +16372,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16261,6 +16387,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16388,16 +16517,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16430,15 +16564,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16450,15 +16594,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16519,18 +16679,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16594,18 +16773,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16639,26 +16829,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16668,15 +16867,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16684,6 +16897,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16822,23 +17038,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16865,18 +17093,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16910,6 +17154,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16988,12 +17235,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17049,8 +17304,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17125,9 +17380,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17179,240 +17445,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24028,6 +24669,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -26273,6 +26917,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -27249,6 +27896,9 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28102,6 +28752,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28111,6 +28784,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32718,24 +33394,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Edit relation"
-
-msgid "Edit relations"
-msgstr "Edit relations"
-
-msgid "No relation is selected"
-msgstr "No relation is selected"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove node ''{0}'' at position {1} from relation ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove way ''{0}'' at position {1} from relation ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 54b9c0c..866d8bd 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2010-09-24 17:25+0000\n"
 "Last-Translator: Johann Beda <Unknown>\n"
 "Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:17+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:19+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5397,6 +5397,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5479,33 +5496,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5553,12 +5559,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10122,9 +10122,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11821,7 +11818,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13090,7 +13087,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14207,9 +14209,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14219,9 +14218,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14232,9 +14228,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14817,6 +14821,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14844,6 +14854,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14874,6 +14887,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14922,21 +14938,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14978,15 +15005,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15002,6 +15044,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15107,9 +15155,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15119,6 +15173,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15203,9 +15260,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15221,31 +15305,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15264,13 +15377,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15279,21 +15392,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15312,6 +15435,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15324,6 +15450,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15451,16 +15580,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15493,15 +15627,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15513,15 +15657,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15582,18 +15742,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15657,18 +15836,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15702,26 +15892,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15731,15 +15930,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15747,6 +15960,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15885,23 +16101,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15928,18 +16156,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15973,6 +16217,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16051,12 +16298,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16112,8 +16367,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16137,345 +16392,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23061,6 +23702,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25306,6 +25950,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26278,6 +26925,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27130,6 +27780,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27139,6 +27812,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31676,24 +32352,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 610599c..0aa2bc4 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-11-01 11:03+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:14+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:16+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: de\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5734,6 +5734,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Their version ({0} entry)"
 msgstr[1] "Their version ({0} entries)"
 
+msgid "My version (local dataset)"
+msgstr "My version (local dataset)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Properties in my dataset, i.e. the local dataset"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+
+msgid "Their version (server dataset)"
+msgstr "Their version (server dataset)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Properties in their dataset, i.e. the server dataset"
+
 msgid "My with Their"
 msgstr "My with Their"
 
@@ -5819,28 +5838,6 @@ msgstr "Node"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Merged nodes not frozen yet. Cannot build resolution command."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Properties in my dataset, i.e. the local dataset"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Properties in their dataset, i.e. the server dataset"
-
-msgid "Coordinates:"
-msgstr "Coordinates:"
-
-msgid "Deleted State:"
-msgstr "Deleted State:"
-
-msgid "Referenced by:"
-msgstr "Referenced by:"
-
 msgid "(none)"
 msgstr "(none)"
 
@@ -5850,6 +5847,15 @@ msgstr "deleted"
 msgid "not deleted"
 msgstr "not deleted"
 
+msgid "Deleted State:"
+msgstr "Deleted State:"
+
+msgid "Coordinates:"
+msgstr "Coordinates:"
+
+msgid "Referenced by:"
+msgstr "Referenced by:"
+
 msgid "Keep my coordinates"
 msgstr "Keep my coordinates"
 
@@ -5895,12 +5901,6 @@ msgstr "Key"
 msgid "Value"
 msgstr "Value"
 
-msgid "My version (local dataset)"
-msgstr "My version (local dataset)"
-
-msgid "Their version (server dataset)"
-msgstr "Their version (server dataset)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Keep the selected key/value pairs from the local dataset"
 
@@ -10882,9 +10882,6 @@ msgstr "Close the dialogue and cancel authorisation"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Close the dialogue and accept the Access Token"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Failed to cancel running OAuth operation"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Retrieving OAuth Request Token from ''{0}''"
 
@@ -12708,8 +12705,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14087,10 +14084,13 @@ msgstr "Reading was cancelled"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Deleted way {0} contains nodes"
@@ -15411,9 +15411,6 @@ msgstr "Opening URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL does not contain {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reserved"
-
 msgid "Outdated Java version"
 msgstr "Outdated Java version"
 
@@ -15423,9 +15420,6 @@ msgstr "Update Java"
 msgid "You are running version {0} of Java."
 msgstr "You are running version {0} of Java."
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15440,9 +15434,17 @@ msgstr ""
 "JOSM will soon stop working with this version; we highly recommend you to "
 "update to Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Would you like to update now ?"
 
+msgid "reserved"
+msgstr "reserved"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16069,6 +16071,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16096,6 +16104,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
 
@@ -16126,6 +16137,9 @@ msgstr "Strava cycling and running heatmap"
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -16174,21 +16188,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16230,15 +16255,30 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16254,6 +16294,12 @@ msgstr "Tiris: DOM (Surface model)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16359,9 +16405,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16371,6 +16423,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16455,9 +16510,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -16473,31 +16555,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -16516,14 +16627,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -16531,21 +16642,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -16564,6 +16685,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16576,6 +16700,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -16705,16 +16832,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16747,15 +16879,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16767,15 +16909,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -16836,18 +16994,37 @@ msgstr "Hillshade Hungary"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -16911,18 +17088,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -16956,26 +17144,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -16985,15 +17182,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17001,6 +17212,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17139,23 +17353,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17182,18 +17408,34 @@ msgstr "RABA-KGZ: Slovenia built-up areas"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "City of Cape Town 2015 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17227,6 +17469,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17305,12 +17550,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (with Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Village Boundaries"
 
@@ -17366,8 +17619,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17442,9 +17695,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17496,240 +17760,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24463,6 +25102,9 @@ msgstr "Seafood"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (Fine Food)"
 
@@ -26759,6 +27401,9 @@ msgstr "{0} must be a positive integer number"
 msgid "unusual value of {0}"
 msgstr "unusual value of {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation without type"
 
@@ -27756,6 +28401,9 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28719,6 +29367,29 @@ msgstr "Debug"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Debugging mode will write images for each processing step."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28728,6 +29399,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33486,24 +34160,6 @@ msgstr "Sign {0}"
 msgid "Additional sign {0}"
 msgstr "Additional sign {0}"
 
-msgid "Edit relation"
-msgstr "Edit relation"
-
-msgid "Edit relations"
-msgstr "Edit relations"
-
-msgid "No relation is selected"
-msgstr "No relation is selected"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove node ''{0}'' at position {1} from relation ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove way ''{0}'' at position {1} from relation ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-
 msgid "routing active route"
 msgstr "routing active route"
 
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index ac1cc2a..6a01572 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-09-21 04:23+0000\n"
 "Last-Translator: Yuri Tretyakov <Unknown>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:43+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:43+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: eo\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5398,6 +5398,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5480,33 +5497,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
+msgid "(none)"
+msgstr "(neniu)"
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr "(neniu)"
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5554,12 +5560,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10123,9 +10123,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11822,7 +11819,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13095,7 +13092,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14212,9 +14214,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14224,9 +14223,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14237,9 +14233,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14822,6 +14826,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14849,6 +14859,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14879,6 +14892,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14927,21 +14943,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14983,15 +15010,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15007,6 +15049,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15112,9 +15160,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15124,6 +15178,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15208,9 +15265,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15226,31 +15310,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15269,13 +15382,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15284,21 +15397,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15317,6 +15440,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15329,6 +15455,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15456,16 +15585,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15498,15 +15632,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15518,15 +15662,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15587,18 +15747,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15662,18 +15841,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15707,26 +15897,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15736,15 +15935,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15752,6 +15965,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15890,23 +16106,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15933,18 +16161,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15978,6 +16222,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16056,12 +16303,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16117,8 +16372,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16142,345 +16397,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23066,6 +23707,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25311,6 +25955,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26283,6 +26930,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27135,6 +27785,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27144,6 +27817,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31681,24 +32357,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/es.po b/i18n/po/es.po
index e153f0d..2c29815 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-03-06 00:25+0000\n"
 "Last-Translator: mor <Unknown>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:08+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:09+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
 "X-Source-Language: C\n"
@@ -5908,6 +5908,28 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Su versión ({0} ingresada)"
 msgstr[1] "Su versión ({0} ingresadas)"
 
+msgid "My version (local dataset)"
+msgstr "Mi versión (conjunto de datos locales)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Propiedade de mi conjunto de datos, es decir el conjunto de datos locales"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propiedades en el elemento fusionado. Sustituirán a las propiedades de mis "
+"elementos cuando se apliquen las decisiones de fusionar."
+
+msgid "Their version (server dataset)"
+msgstr "Su versión (conjunto de datos del servidor)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propiedades en su conjunto de datos, esto es, en el conjunto de datos del "
+"servidor"
+
 msgid "My with Their"
 msgstr "Mía respecto a la suya"
 
@@ -5996,31 +6018,6 @@ msgstr ""
 "Los nodos fusionados aún no están congelados. No se puede construir la orden "
 "de resolución."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Propiedade de mi conjunto de datos, es decir el conjunto de datos locales"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propiedades en el elemento fusionado. Sustituirán a las propiedades de mis "
-"elementos cuando se apliquen las decisiones de fusionar."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propiedades en su conjunto de datos, esto es, en el conjunto de datos del "
-"servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenadas:"
-
-msgid "Deleted State:"
-msgstr "Estado borrado:"
-
-msgid "Referenced by:"
-msgstr "Referenciada por:"
-
 msgid "(none)"
 msgstr "(ninguno)"
 
@@ -6030,6 +6027,15 @@ msgstr "borrado"
 msgid "not deleted"
 msgstr "no borrado"
 
+msgid "Deleted State:"
+msgstr "Estado borrado:"
+
+msgid "Coordinates:"
+msgstr "Coordenadas:"
+
+msgid "Referenced by:"
+msgstr "Referenciada por:"
+
 msgid "Keep my coordinates"
 msgstr "Mantener mis coordenadas"
 
@@ -6078,12 +6084,6 @@ msgstr "Clave"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "Mi versión (conjunto de datos locales)"
-
-msgid "Their version (server dataset)"
-msgstr "Su versión (conjunto de datos del servidor)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Mantener la pareja clave/valor seleccionado del conjunto de datos locales"
@@ -11240,9 +11240,6 @@ msgstr "Cerrar el diálogo y cancelar autorización"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Cerrar el diálogo y aceptar la llave de Autorización"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Error al cancelar la operación de OAuth ejecutandose"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Obteniendo Llave de solicitud OAuth de \"{0}\""
 
@@ -13149,8 +13146,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Rejilla suiza (Suiza)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sin correcciones locales)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupe Fuerte Marigot 1949"
@@ -14587,11 +14584,13 @@ msgstr "La lectura fue cancelada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Falta atributos obligatorios en el elemento ''bounds''. Los valores actuales "
-"son minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', "
-"origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "La vía borrada {0} contiene nodos"
@@ -15962,9 +15961,6 @@ msgstr "Abriendo URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "La URL no contiene {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reservado"
-
 msgid "Outdated Java version"
 msgstr "Versión desactualizada de Java"
 
@@ -15974,9 +15970,6 @@ msgstr "Actualizar Java"
 msgid "You are running version {0} of Java."
 msgstr "Está ejecutando la versión {0} de Java."
 
-msgid "April 2015"
-msgstr "Abril de 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15989,9 +15982,17 @@ msgstr ""
 "En poco tiempo JOSM dejará de trabajar con esta versión; le recomendamos que "
 "actualice a Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "¿Desea actualizar ahora?"
 
+msgid "reserved"
+msgstr "reservado"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16633,6 +16634,12 @@ msgstr "HDM (Equipo Humanitario de OSM)"
 msgid "Mapbox Satellite"
 msgstr "Imagen Satelital Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16660,6 +16667,9 @@ msgstr "OpenStreetMap (estilo alemán)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "Trazas de GPS OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transporte Público (ÖPNV)"
 
@@ -16690,6 +16700,9 @@ msgstr "Strava - Mapa de calor de ciclismo y running"
 msgid "Locator Overlay"
 msgstr "Superponer ubicador"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA Sin dirección"
 
@@ -16738,21 +16751,32 @@ msgstr "OSM Inspector: Línea costera (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "Imágenes de imagico.de: Montes Prokletije"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "Imágenes de imagico.de: Montañas Transantárticas del Sur"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "Imágenes de imagico.de: Montañas Pensacola"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "Imágenes de imagico.de: Isla Elefante/Isla Clarence"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16794,15 +16818,30 @@ msgstr "Límites administrativos de Reservas NPWS de LPI NSW"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "Imágenes de imagico.de: Noroeste de la isla Heard"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "Imágenes de imagico.de: Costa de la isla Heard"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16818,6 +16857,12 @@ msgstr "Tiris: DOM (modelo de superficie)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: líneas de contorno"
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (propósito general)"
 
@@ -16923,9 +16968,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "Imágenes de imagico.de: Cotonú"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "Imágenes de imagico.de: Isla Bouvet"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Sectores Urbanos"
 
@@ -16935,6 +16986,9 @@ msgstr "IBGE Mapa de Sectores Rurales"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Mosaico de Río de Janeiro 2013"
 
@@ -17019,9 +17073,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Hidrografía Geobase"
 
@@ -17037,32 +17118,61 @@ msgstr "Mosaico de Columbia Británica"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Último Landsat del sudoeste de la Columbia Británica"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Superposición de callejero de Kelowna"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "Imágenes de imagico.de: Costa este de la Isla Devon"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "Imágenes de imagico.de: Norte de la isla de Ellesmere"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 "Imágenes de imagico.de: Norte de la isla de Ellesmere en Julio de 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "Imágenes de imagico.de: Fogo, Cabo Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "Imágenes de imagico.de: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "Imágenes de imagico.de: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Chequia CUZK:KM"
 
@@ -17081,14 +17191,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Dinamarca)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Vista de Geodatastyrelsen Cadastral Parcels INSPIRE"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -17096,21 +17206,31 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "Imágenes de imagico.de: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr "Imágenes de imagico.de: Islas Darwin y Wolf, Galápagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Mapa base de Estonia (Maaamet)"
 
@@ -17129,6 +17249,9 @@ msgstr "Bosques de Estonia (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17141,6 +17264,9 @@ msgstr "Burdeos - 2012"
 msgid "Cadastre"
 msgstr "Catastro"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17271,16 +17397,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17313,15 +17444,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "Imágenes de imagico.de: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "Imágenes de imagico.de: Base aérea de Thule"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17333,15 +17474,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "Imágenes de imagico.de: Mosaico de Groenlandia"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imágenes aéreas de drones (Haití)"
 
@@ -17402,18 +17559,37 @@ msgstr "Sombreado (hillshade) en Hungría"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "Imágenes de imagico.de: Este de Islandia"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "Imágenes de imagico.de: Rann de Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "Imágenes de imagico.de: Sureste de Célebes"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "Imágenes de imagico.de: Represa de Bakun"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "Imágenes de imagico.de: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Oficina de Guerra de Irlanda del Norte 1:25k GSGS 3906"
 
@@ -17477,18 +17653,29 @@ msgstr "Tirol Sur Ortofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Ortofoto de Tirol del Sur 2011 (alta resolución)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Ortofoto de Tirol del Sur 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Tirol Sur Topomapa"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "Imágenes de imagico.de: Monte Kenia 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "URSS - Letonia"
 
@@ -17522,26 +17709,35 @@ msgstr "Inspire Water Luxemburgo"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta del Níger Oct 2012"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard - Ortofoto de 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "Imágenes de imagico.de: Karakoram occidental"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Franja de Gaza - Pléyades - 2014/07/06"
 
@@ -17551,15 +17747,29 @@ msgstr "Franja de Gaza - Pléyades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr "Imágenes de imagico.de: Canal de Panamá - lado del Pacífico"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "Imágenes de imagico.de: Canal de Panamá"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "Imágenes de imagico.de: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "Imágenes de imagico.de: Nueva Irlanda"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "Imágenes de imagico.de: Coropuna"
 
@@ -17567,6 +17777,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr "Imágenes de imagico.de: Cordillera de Vilcanota y glaciar Quelccaya"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17705,23 +17918,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "Imágenes de imagico.de: Estrecho de Kerch"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "Imágenes de imagico.de: Isla de Ushakov en Agosto de 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "Imágenes de imagico.de: Cosmódromo Vostochni"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr ""
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17748,18 +17973,34 @@ msgstr "RABA-KGZ: Eslovenia - Área urbanizada"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Ciudad del Cabo aérea 2013"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Ciudad de Cabo 2015 Aérea"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sudáfrica CD:NGI Aérea"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "Imágenes de imagico.de: Isla Scott"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17793,6 +18034,9 @@ msgstr "GRAFCAN Expresa - Islas Canarias"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "Imágenes de imagico.de: Puente Adams"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Cantón Aargau 25cm (AGIS 2011)"
 
@@ -17872,12 +18116,20 @@ msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 "Imágenes de imagico.de: Alpes centrales a finales de septiembre de 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Datos abiertos Taiwan e-Map"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Datos abiertos Taiwan e-Map (con línea de contorno)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Límites de Pueblos de Taiwan"
 
@@ -17933,8 +18185,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "Imágenes de imagico.de: Cordillera de Alaska"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -18009,9 +18261,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Ortofotografía de Delaware 2012"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "Imágenes de imagico.de: Montañas Rwenzori"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "Imágenes de imagico.de: Montañas Rwenzori 2016"
 
@@ -18063,240 +18326,615 @@ msgstr "NLS - Bartolomé Media Pulgada, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "Planos urbanos OS, Aberden 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "Planos urbanos OS, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "Planos urbanos OS, Alejandría 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "Planos urbanos OS, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "Planos urbanos OS, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "Planos urbanos OS, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "Planos urbanos OS, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "Planos urbanos OS, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "Planos urbanos OS, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "Planos urbanos OS, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "Planos urbanos OS, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "Planos urbanos OS, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Planos de la Ciudad, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "Planos urbanos OS, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "Planos urbanos OS, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "Planos urbanos OS, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "Planos urbanos OS, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "Planos urbanos OS, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "Planos urbanos OS, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "Planos urbanos OS, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "Planos urbanos OS, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "Planos urbanos OS, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "Planos urbanos OS, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "Planos urbanos OS, Edimburgo 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "Planos urbanos OS, Edimburgo 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "Planos urbanos OS, Edimburgo 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "Planos urbanos OS, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "Planos urbanos OS, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "Planos urbanos OS, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "Planos urbanos OS, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "Planos urbanos OS, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "Planos urbanos OS, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "Planos urbanos OS, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "Planos urbanos OS, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "Planos urbanos OS, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "Planos urbanos OS, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "Planos urbanos OS, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "Planos urbanos OS, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "Planos urbanos OS, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "Planos urbanos OS, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "Planos urbanos OS, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "Planos urbanos OS, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "Planos urbanos OS, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "Planos urbanos OS, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "Planos urbanos OS, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "Planos urbanos OS, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "Planos urbanos OS, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "Planos urbanos OS, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "Planos urbanos OS, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "Planos urbanos OS, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "Planos urbanos OS, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "Planos urbanos OS, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "Planos urbanos OS, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "Planos urbanos OS, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "Planos urbanos OS, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "Planos urbanos OS, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "Planos urbanos OS, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "Planos urbanos OS, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Planos Urbanos, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "Planos urbanos OS, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "Planos urbanos OS, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "Planos urbanos OS, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "Planos urbanos OS, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "Planos urbanos OS, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "Planos urbanos OS, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "Planos urbanos OS, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "Planos urbanos OS, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "Planos urbanos OS, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "Planos urbanos OS, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "Planos urbanos OS, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "Planos urbanos OS, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "Planos urbanos OS, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "Planos urbanos OS, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "Planos urbanos OS, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "Planos urbanos OS, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "Planos urbanos OS, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "Planos urbanos OS, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -25105,6 +25743,9 @@ msgstr "Pescadería o marisquería"
 msgid "Dairy"
 msgstr "Lechería"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delicatessen"
 
@@ -27429,6 +28070,9 @@ msgstr "{0} debe ser un número entero positivo"
 msgid "unusual value of {0}"
 msgstr "valor poco común de {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation sin type"
 
@@ -28445,6 +29089,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29447,6 +30094,29 @@ msgstr "Depurar"
 msgid "Debugging mode will write images for each processing step."
 msgstr "El modo de depuración escribirá imágenes para cada paso del proceso."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29456,6 +30126,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -34345,24 +35018,6 @@ msgstr "Señal {0}"
 msgid "Additional sign {0}"
 msgstr "Señal Adicional {0}"
 
-msgid "Edit relation"
-msgstr "Editar relación"
-
-msgid "Edit relations"
-msgstr "Editar relaciones"
-
-msgid "No relation is selected"
-msgstr "No se seleccionó ninguna relación"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Eliminar nodo ''{0}'' en la posición {1} de la relación ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Eliminar vía ''{0}'' en la posición {1} de la relación ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Eliminar relación ''{0}'' en la posición {1} de la relación ''{2}''"
-
 msgid "routing active route"
 msgstr "ruteando itinerario activo"
 
diff --git a/i18n/po/et.po b/i18n/po/et.po
index ce7fc8a..294c68a 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-23 08:40+0000\n"
 "Last-Translator: Margus Värton <margus at dakar.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:43+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:44+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: et\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5480,6 +5480,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5562,33 +5579,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
+msgid "(none)"
 msgstr ""
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "deleted"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "not deleted"
 msgstr ""
 
-msgid "Coordinates:"
-msgstr "Koordinaadid:"
-
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
-msgstr ""
+msgid "Coordinates:"
+msgstr "Koordinaadid:"
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5636,12 +5642,6 @@ msgstr "Võti"
 msgid "Value"
 msgstr "Väärtus"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10287,9 +10287,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11995,7 +11992,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13288,7 +13285,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14428,9 +14430,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr "reserveeritud"
-
 msgid "Outdated Java version"
 msgstr "Aegunud Java versioon"
 
@@ -14440,9 +14439,6 @@ msgstr "Uuenda Java"
 msgid "You are running version {0} of Java."
 msgstr "Praegu töötab sul Java versioon {0}."
 
-msgid "April 2015"
-msgstr "Aprill 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14457,9 +14453,17 @@ msgstr ""
 "JOSM lõpetab töötamast selle versiooniga. Soovitatav oleks et sa uuendad "
 "Java versioonile {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Kas soovid kohe uuendada?"
 
+msgid "reserved"
+msgstr "reserveeritud"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15054,6 +15058,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15081,6 +15091,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15111,6 +15124,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15159,21 +15175,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15215,15 +15242,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15239,6 +15281,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15344,9 +15392,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15356,6 +15410,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15440,9 +15497,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15458,31 +15542,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15501,13 +15614,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15516,21 +15629,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15549,6 +15672,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15561,6 +15687,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15688,16 +15817,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15730,15 +15864,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15750,15 +15894,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15819,18 +15979,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15894,18 +16073,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15939,26 +16129,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15968,15 +16167,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15984,6 +16197,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16122,23 +16338,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16165,18 +16393,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16210,6 +16454,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16288,12 +16535,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16349,8 +16604,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16374,345 +16629,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23307,6 +23948,9 @@ msgstr "Mereannid"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delikatessid"
 
@@ -25552,6 +26196,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26524,6 +27171,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27386,6 +28036,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27395,6 +28068,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31946,24 +32622,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index b3f5c07..eccf390 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-03-09 16:55+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:37+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:38+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: eu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5570,6 +5570,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Beraien bertsioa (elementu {0})"
 msgstr[1] "Beraien bertsioa ({0} elementu)"
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr "Nirea eta Beraiena"
 
@@ -5658,26 +5675,6 @@ msgstr ""
 "Batutako nodoak ez daude izoztuta oraindik. Ezin dugu ebazpen komandoa "
 "eraiki."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-
-msgid "Coordinates:"
-msgstr "Koordenatuak:"
-
-msgid "Deleted State:"
-msgstr "Ezabatutako egoera:"
-
-msgid "Referenced by:"
-msgstr "Noren erreferentzia:"
-
 msgid "(none)"
 msgstr "(bat ere ez)"
 
@@ -5687,6 +5684,15 @@ msgstr "ezabatua"
 msgid "not deleted"
 msgstr "ezabatu gabe"
 
+msgid "Deleted State:"
+msgstr "Ezabatutako egoera:"
+
+msgid "Coordinates:"
+msgstr "Koordenatuak:"
+
+msgid "Referenced by:"
+msgstr "Noren erreferentzia:"
+
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5732,12 +5738,6 @@ msgstr "Gakoa"
 msgid "Value"
 msgstr "Balioa"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10308,9 +10308,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12007,7 +12004,7 @@ msgstr "PUWG Zonaldea"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suitza)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13276,7 +13273,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14394,9 +14396,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14406,9 +14405,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14419,9 +14415,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15009,6 +15013,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15036,6 +15046,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15066,6 +15079,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15114,21 +15130,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15170,15 +15197,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15194,6 +15236,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15299,9 +15347,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15311,6 +15365,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15395,9 +15452,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15413,31 +15497,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15456,13 +15569,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15471,21 +15584,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15504,6 +15627,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15516,6 +15642,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15643,16 +15772,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15685,15 +15819,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15705,15 +15849,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15774,18 +15934,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15849,18 +16028,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15894,26 +16084,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15923,15 +16122,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15939,6 +16152,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16077,23 +16293,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16120,18 +16348,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16165,6 +16409,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16243,12 +16490,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16304,8 +16559,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16329,345 +16584,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23293,6 +23934,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25538,6 +26182,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26510,6 +27157,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27362,6 +28012,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27371,6 +28044,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31913,24 +32589,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr "Erlazioak editatu"
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 0071455..feee4f0 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2014-03-18 07:32+0000\n"
 "Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
 "Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:02+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:03+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: fa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5455,6 +5455,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5537,33 +5554,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5611,12 +5617,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10189,9 +10189,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11888,7 +11885,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13157,7 +13154,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14274,9 +14276,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14286,9 +14285,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14299,9 +14295,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14884,6 +14888,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14911,6 +14921,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14941,6 +14954,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14989,21 +15005,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15045,15 +15072,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15069,6 +15111,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15174,9 +15222,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15186,6 +15240,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15270,9 +15327,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15288,31 +15372,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15331,13 +15444,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15346,21 +15459,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15379,6 +15502,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15391,6 +15517,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15518,16 +15647,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15560,15 +15694,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15580,15 +15724,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15649,18 +15809,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15724,18 +15903,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15769,26 +15959,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15798,15 +15997,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15814,6 +16027,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15952,23 +16168,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15995,18 +16223,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16040,6 +16284,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16118,12 +16365,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16179,8 +16434,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16204,345 +16459,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23128,6 +23769,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25373,6 +26017,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26345,6 +26992,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27197,6 +27847,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27206,6 +27879,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31743,24 +32419,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index ba22ce7..b2ee965 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-01-19 17:11+0000\n"
 "Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:44+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:45+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: fi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5717,6 +5717,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Muitten versio ({0} rivi)"
 msgstr[1] "Muitten versio ({0} riviä)"
 
+msgid "My version (local dataset)"
+msgstr "Minun versioni (paikalliset tiedot)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Ominaisuudet omassa tiedoissani, t.s. paikalliset tiedot"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Ominaisuudet yhdistetyssä elementissä. Ne korvaavat ominaisuudet omassa "
+"elementeissäni kun yhdistämispäätökset on vahvistettu."
+
+msgid "Their version (server dataset)"
+msgstr "Heidän versionsa (palvelimen tiedot)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Ominaisuudet heidän tiedoissaan, t.s. palvelimen tiedot"
+
 msgid "My with Their"
 msgstr "Omaa ja muiden"
 
@@ -5805,28 +5824,6 @@ msgstr ""
 "Yhdistettyjä pisteitä ei ole vielä lukittu. Toteutuskomentoa ei voida "
 "rakentaa."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Ominaisuudet omassa tiedoissani, t.s. paikalliset tiedot"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Ominaisuudet yhdistetyssä elementissä. Ne korvaavat ominaisuudet omassa "
-"elementeissäni kun yhdistämispäätökset on vahvistettu."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Ominaisuudet heidän tiedoissaan, t.s. palvelimen tiedot"
-
-msgid "Coordinates:"
-msgstr "Koordinaatit:"
-
-msgid "Deleted State:"
-msgstr "Poistettu tila:"
-
-msgid "Referenced by:"
-msgstr "Viittaaja:"
-
 msgid "(none)"
 msgstr "(ei mitään)"
 
@@ -5836,6 +5833,15 @@ msgstr "poistettu"
 msgid "not deleted"
 msgstr "ei poistettu"
 
+msgid "Deleted State:"
+msgstr "Poistettu tila:"
+
+msgid "Coordinates:"
+msgstr "Koordinaatit:"
+
+msgid "Referenced by:"
+msgstr "Viittaaja:"
+
 msgid "Keep my coordinates"
 msgstr "Säilytä koordinaattini"
 
@@ -5881,12 +5887,6 @@ msgstr "Avain"
 msgid "Value"
 msgstr "Arvo"
 
-msgid "My version (local dataset)"
-msgstr "Minun versioni (paikalliset tiedot)"
-
-msgid "Their version (server dataset)"
-msgstr "Heidän versionsa (palvelimen tiedot)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Pidä valitut avain/arvoparit paikallisista tiedoista"
 
@@ -10760,9 +10760,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12533,8 +12530,8 @@ msgstr "PUWG-alue"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveitsi)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (ilman paikalliskorjauksia)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13870,7 +13867,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -15050,9 +15052,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr "varattu"
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -15062,9 +15061,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15077,9 +15073,17 @@ msgstr ""
 "Seuraavat versiot JOSM:sta eivät välttämättä toimi tämän version kanssa. "
 "Suosittelemme päivittämään Javan versioon {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr "varattu"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15676,6 +15680,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15703,6 +15713,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15733,6 +15746,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15781,21 +15797,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15837,15 +15864,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15861,6 +15903,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15966,9 +16014,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15978,6 +16032,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16062,9 +16119,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16080,31 +16164,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16123,13 +16236,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16138,21 +16251,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16171,6 +16294,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16183,6 +16309,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16310,16 +16439,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16352,15 +16486,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16372,15 +16516,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16441,18 +16601,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16516,18 +16695,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16561,26 +16751,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16590,15 +16789,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16606,6 +16819,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16744,23 +16960,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16787,18 +17015,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16832,6 +17076,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16910,12 +17157,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16971,8 +17226,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17047,9 +17302,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17101,240 +17367,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23960,6 +24601,9 @@ msgstr "Mereneläviä"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (herkkukauppa)"
 
@@ -26218,6 +26862,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -27202,6 +27849,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28060,6 +28710,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28069,6 +28742,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32668,24 +33344,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 84ef925..0b3a569 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-06-19 14:15+0000\n"
 "Last-Translator: Anthony Balico <Unknown>\n"
 "Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:18+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:19+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: fil\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 2824df4..ea68e8d 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-02-28 16:15+0000\n"
 "Last-Translator: LiFo <Unknown>\n"
 "Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:44+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:45+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index d6b289b..c122d8b 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-28 19:54+0000\n"
-"Last-Translator: Carolopolitain <david_chmfr at yahoo.fr>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-10 06:28+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:45+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:46+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: fr\n"
 "X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
 
@@ -5872,6 +5872,27 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Version du serveur ({0} élément)"
 msgstr[1] "Version du serveur ({0} éléments)"
 
+msgid "My version (local dataset)"
+msgstr "Ma version"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Propriétés de mon jeu de données, par exemple le jeu de données local"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propriétés de l’élément fusionné. Elles vont remplacer les propriétés de mes "
+"éléments lorsque la fusion sera appliquée."
+
+msgid "Their version (server dataset)"
+msgstr "Version du serveur"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propriétés de leur jeu de données, par exemple le jeu de données du serveur"
+
 msgid "My with Their"
 msgstr "Le mien avec le leur"
 
@@ -5960,30 +5981,6 @@ msgstr ""
 "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
 "commande de résolution"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Propriétés de mon jeu de données, par exemple le jeu de données local"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propriétés de l’élément fusionné. Elles vont remplacer les propriétés de mes "
-"éléments lorsque la fusion sera appliquée."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propriétés de leur jeu de données, par exemple le jeu de données du serveur"
-
-msgid "Coordinates:"
-msgstr "Coordonnées :"
-
-msgid "Deleted State:"
-msgstr "État :"
-
-msgid "Referenced by:"
-msgstr "Référencé par :"
-
 msgid "(none)"
 msgstr "aucun"
 
@@ -5993,6 +5990,15 @@ msgstr "supprimé"
 msgid "not deleted"
 msgstr "non supprimé"
 
+msgid "Deleted State:"
+msgstr "État :"
+
+msgid "Coordinates:"
+msgstr "Coordonnées :"
+
+msgid "Referenced by:"
+msgstr "Référencé par :"
+
 msgid "Keep my coordinates"
 msgstr "Conserver mes coordonnées"
 
@@ -6041,12 +6047,6 @@ msgstr "Clé"
 msgid "Value"
 msgstr "Valeur"
 
-msgid "My version (local dataset)"
-msgstr "Ma version"
-
-msgid "Their version (server dataset)"
-msgstr "Version du serveur"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Conserver la paire clé/valeur du jeu de données local"
 
@@ -11163,9 +11163,6 @@ msgstr "Annuler l’autorisation d’accès et fermer la fenêtre"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Accepter l’autorisation d’accès et fermer la fenêtre"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Impossible dʼannuler lʼopération OAuth en cours."
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Récupération de la requête d’accès OAuth depuis ''{0}''"
 
@@ -13029,8 +13026,8 @@ msgstr "Zone PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grille (Suisse)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sans corrections locales)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort Marigot 1949"
@@ -14481,11 +14478,13 @@ msgstr "La lecture a été annulée"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Attributs requis manquants sur l''élément ''bounds''. Les attributs lus sont "
-"minlon=''{0}'', minlat=''{1}'', maxlon=''{3}'', maxlat=''{4}'', "
-"origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Le chemin supprimé {0} possède des nœuds"
@@ -15869,9 +15868,6 @@ msgstr "Ouverture de lʼURL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "LʼURL ne contient pas {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "réservé"
-
 msgid "Outdated Java version"
 msgstr "Version de Java obsolète"
 
@@ -15881,9 +15877,6 @@ msgstr "Mise à jour de Java"
 msgid "You are running version {0} of Java."
 msgstr "Vous utilisez la {0} version de Java."
 
-msgid "April 2015"
-msgstr "Avril 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15898,9 +15891,17 @@ msgstr ""
 "JOSM cessera bientôt de fonctionner avec cette version; nous vous "
 "recommandons vivement de mettre à jour vers Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Voulez-vous mettre à jour maintenant ?"
 
+msgid "reserved"
+msgstr "réservé"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16543,6 +16544,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Satellite Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16570,6 +16577,9 @@ msgstr "OpenStreetMap (Style allemand)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "Traces GPS OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transport Public (ÖPNV)"
 
@@ -16600,6 +16610,9 @@ msgstr "Strava − Carte de chaleur vélo et course à pied"
 msgid "Locator Overlay"
 msgstr "Surcouche Localisation"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA Pas d''adresse"
 
@@ -16648,21 +16661,32 @@ msgstr "OSM Inspector : Ligne de côte (UE)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16704,15 +16728,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthophoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16728,6 +16767,12 @@ msgstr "Tiris : DOM (modèle de surface)"
 msgid "Tiris: contour lines"
 msgstr "Tiris : Courbes de niveau"
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienne : Mehrzweckkarte (cadre général)"
 
@@ -16833,9 +16878,15 @@ msgstr "Benin : Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Carte des secteurs urbains"
 
@@ -16845,6 +16896,9 @@ msgstr "IBGE Carte des secteurs ruraux"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Mosaïque Rio 2013"
 
@@ -16929,9 +16983,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Hydrographie Geobase"
 
@@ -16947,31 +17028,60 @@ msgstr "Mosaïque de la Colombie Britannique"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Dernières images Landsat de la Colombie britannique"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Surcouche Routes Kelowna"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "République tchèque CUZK:KM"
 
@@ -16990,14 +17100,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Danemark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -17005,21 +17115,31 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danemark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danemark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Carte de base estonienne (Maaamet)"
 
@@ -17038,6 +17158,9 @@ msgstr "Sylviculture estonienne (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17050,6 +17173,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17181,16 +17307,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17218,20 +17349,30 @@ msgid "Mainz latest aerial imagery"
 msgstr ""
 
 msgid "Munich latest aerial imagery 60cm"
-msgstr ""
+msgstr "Munich: dernière image aérienne 60 cm"
 
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17243,15 +17384,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imagerie drone (Haïti)"
 
@@ -17262,7 +17419,7 @@ msgid "Drone Imagery Canaan(Haiti) November 2015"
 msgstr "Drone Imagery Canaan(Haiti) novembre 2015"
 
 msgid "Drone Imagery Matthew(Haiti) October 2016"
-msgstr ""
+msgstr "Imagerie drone Cyclone Matthew (Haïti) Octobre 2016"
 
 msgid "FÖMI orthophoto 2000"
 msgstr ""
@@ -17312,18 +17469,37 @@ msgstr "Ombrage Hongrie"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Irlande Bureau de la guerre britannique 1:25k GSGS 3906"
 
@@ -17387,18 +17563,29 @@ msgstr "Orthophotographie Sud Tyrol 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "Carte topographique Sud Tyrol"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Lettonie"
 
@@ -17432,26 +17619,35 @@ msgstr "Luxembourg Inspire Eau"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta du Niger Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Bande de Gaza - Pléiades - 2014/07/06"
 
@@ -17461,15 +17657,29 @@ msgstr "Bande de Gaza - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17477,6 +17687,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17615,23 +17828,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17658,18 +17883,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Métropole du Cap 2013 aérien"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Métropole du Cap 2015 aérien"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Afrique du Sud CD:NGI Aérien"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17703,6 +17944,9 @@ msgstr "GRAFCAN Express - Îles Canaries"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Canton d''Argovie 25 cm (AGIS 2011)"
 
@@ -17781,12 +18025,20 @@ msgstr "Kanton Basel-Landschaft 10cm (2015)"
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taïwan e-Map Données Ouvertes"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Délimitations des villages taiwanais"
 
@@ -17842,8 +18094,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17918,9 +18170,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17972,243 +18235,618 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 "OS Plans de ville, Édimbourg 1849-1851 (Bibliothèque nationale d''Écosse)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 "OS Plans de ville, Édimbourg 1876-1877 (Bibliothèque nationale d''Écosse)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 "OS Plans de ville, Édimbourg 1893-1894 (Bibliothèque nationale d''Écosse)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "Plans de ville Ordnance Survey, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "Plans de ville Ordnance Survey, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -18977,7 +19615,7 @@ msgstr "Aucun véhicule à roue"
 
 msgctxt "riding"
 msgid "horse_riding"
-msgstr ""
+msgstr "équitation"
 
 msgctxt "riding"
 msgid "pitch"
@@ -19462,7 +20100,7 @@ msgstr "Course à pied"
 
 msgctxt "sport"
 msgid "safety_training"
-msgstr ""
+msgstr "Sauvetage"
 
 msgctxt "sport"
 msgid "shooting"
@@ -19962,7 +20600,7 @@ msgid "Destination"
 msgstr "Destination"
 
 msgid "Destination reference"
-msgstr ""
+msgstr "Destination"
 
 msgid "Placement"
 msgstr "Localisation"
@@ -20304,7 +20942,7 @@ msgid "Ford"
 msgstr "Gué"
 
 msgid "stepping_stones"
-msgstr ""
+msgstr "Chemin constitués de rochers permettant le passage du cours d’eau"
 
 msgid "Ways"
 msgstr "Chemins"
@@ -21615,13 +22253,13 @@ msgid "Type 1 (Yazaki)"
 msgstr "Type 1 (Yazaki)"
 
 msgid "Type 1 Combo"
-msgstr ""
+msgstr "Prise de type 1"
 
 msgid "Type 2 (Mennekes)"
 msgstr "Type 2 (Mennekes)"
 
 msgid "Type 2 Combo"
-msgstr ""
+msgstr "Prise de type 2"
 
 msgid "Type 3 (SCAME)"
 msgstr "Type 3 (SCAME)"
@@ -21968,7 +22606,7 @@ msgid "Taxiway"
 msgstr "Voie de circulation"
 
 msgid "Holding Position"
-msgstr ""
+msgstr "Point d’attente"
 
 msgid "Helipad"
 msgstr "Héliport"
@@ -22298,7 +22936,7 @@ msgid "Water Park"
 msgstr "Parc aquatique"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Plage aménagée"
 
 msgid "Swimming Pool"
 msgstr "Piscine"
@@ -22661,7 +23299,7 @@ msgid "Emergency Phone Number"
 msgstr "Numéro de téléphone d’urgence"
 
 msgid "(Use number as shown on plate.)"
-msgstr ""
+msgstr "(Utilisez le numéro indiqué sur la plaque.)"
 
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -23164,7 +23802,7 @@ msgstr ""
 
 msgctxt "golf"
 msgid "Lateral water hazard"
-msgstr ""
+msgstr "Risque lié à l’eau"
 
 msgctxt "golf"
 msgid "Green"
@@ -23172,7 +23810,7 @@ msgstr "Green"
 
 msgctxt "golf"
 msgid "Fairway"
-msgstr ""
+msgstr "Fairway"
 
 msgctxt "golf"
 msgid "Rough"
@@ -24996,6 +25634,9 @@ msgstr "Poissonnerie"
 msgid "Dairy"
 msgstr "Laiterie"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Épicerie fine"
 
@@ -26483,16 +27124,16 @@ msgid "Outline of building"
 msgstr ""
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Segment interne"
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Arête de toit"
 
 msgid "Roof edge"
 msgstr ""
 
 msgid "Building level"
-msgstr ""
+msgstr "Niveau de construction"
 
 msgid "Site"
 msgstr "Site"
@@ -26825,7 +27466,7 @@ msgid "View UNESCO sheet"
 msgstr "Afficher la fiche UNESCO"
 
 msgid "View %name% image"
-msgstr ""
+msgstr "Afficher %name% de l’image"
 
 msgid "View %name% sheet of river"
 msgstr ""
@@ -26840,10 +27481,10 @@ msgid "View %name% map of municipalities"
 msgstr ""
 
 msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "Afficher %name% de la liste des communes"
 
 msgid "View %name% map of cantons"
-msgstr ""
+msgstr "Afficher %name% des cantons"
 
 msgid "View %name% list of cantons"
 msgstr ""
@@ -26879,7 +27520,7 @@ msgid "View %name% sheet of geodesic site"
 msgstr ""
 
 msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "Voir la liste des références UAI des écoles"
 
 msgid "View %name% sheet of hospital/home"
 msgstr ""
@@ -26990,7 +27631,7 @@ msgid "Different number of lanes in the keys {0} and {1}"
 msgstr ""
 
 msgid "possibly missing {0} tag"
-msgstr ""
+msgstr "Oubli possible de tag {0}"
 
 msgid "street with odd number of {0}, but without {1} and {2} or {3}"
 msgstr ""
@@ -27108,7 +27749,7 @@ msgid "misspelled value"
 msgstr "valeur mal orthographiée"
 
 msgid "wrong value: {0}"
-msgstr ""
+msgstr "Mauvaise valeur: {0}"
 
 msgid "{0} on a node. Should be used on a way."
 msgstr "{0} sur un nœud. Devrait être employé sur un chemin."
@@ -27297,6 +27938,9 @@ msgstr "{0} doit être un nombre entier positif"
 msgid "unusual value of {0}"
 msgstr "valeur inhabituelle de {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relation sans type"
 
@@ -27319,7 +27963,7 @@ msgid "street name contains ss"
 msgstr "le nom de rue contient ss"
 
 msgid "street name contains ß"
-msgstr ""
+msgstr "Le nom de la voie contient ß"
 
 msgid "{0} is unnecessary"
 msgstr "{0} n’est pas nécessaire"
@@ -27367,21 +28011,26 @@ msgstr ""
 
 msgid "wikipedia page title should have first letter capitalized"
 msgstr ""
+"Le titre de la page wikipedia devrait avoir la première lettre en majuscule"
 
 msgid ""
 "wikipedia page title should have spaces instead of underscores (''_''→'' '')"
 msgstr ""
+"Le titre de la page Wikipedia devrait avoir des espaces au lieu des "
+"underscores ('' _ '' → '' '')"
 
 msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
 msgstr ""
 
 msgid "wikidata tag must be in Qnnnn format, where n is a digit"
-msgstr ""
+msgstr "La balise wikidata doit être au format Qnnnn, où n est un chiffre"
 
 msgid ""
 "wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
 "help with wikidata id lookups"
 msgstr ""
+"La page Wikipedia est définie, mais il n’y a pas d’élément Wikidata. Le "
+"plugin Wikipedia peut aider à rechercher l’élément Wikidata"
 
 msgid ""
 "wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
@@ -28035,7 +28684,7 @@ msgid "Mapillary object layer"
 msgstr ""
 
 msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "Affiche la couche montrant les objets détectés par Mapillary"
 
 msgid "Mapillary"
 msgstr "Mapillary"
@@ -28074,10 +28723,10 @@ msgid "Join/unjoin pictures"
 msgstr "(Dés)assembler les images"
 
 msgid "Submit changeset"
-msgstr ""
+msgstr "Soumettez les changements"
 
 msgid "Submit the current changeset"
-msgstr ""
+msgstr "Soumettez l’ensemble des modifications actuelles"
 
 msgid "Submit the current changeset to Mapillary"
 msgstr ""
@@ -28091,6 +28740,10 @@ msgid ""
 "appears for the first time, simply try it again. This might have been an "
 "issue with the internet connection."
 msgstr ""
+"Une exception s’est produite lors de la tentative d’envoi des modifications. "
+"Si cela se produit à plusieurs reprises, pensez à signaler un bug via le "
+"menu Aide. Si ce message apparaît pour la première fois, essayez-le à "
+"nouveau. Cela pourrait avoir été un problème avec la connexion Internet."
 
 msgid "Upload pictures"
 msgstr "Envoi de photographies"
@@ -28120,7 +28773,7 @@ msgid "Mapillary changeset"
 msgstr ""
 
 msgid "Submitting changeset to server…"
-msgstr ""
+msgstr "Envoyer les modifications au serveur ..."
 
 msgid "Export all images"
 msgstr "Exporter toutes les images"
@@ -28213,7 +28866,7 @@ msgid "No image selected"
 msgstr "Pas d''image sélectionnée"
 
 msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "Appuyez sur \"{0}\" pour télécharger des images"
 
 msgid "Mapillary picture"
 msgstr "Image Mapillary"
@@ -28272,7 +28925,7 @@ msgstr ""
 "suivante/précédente"
 
 msgid "Preview images when hovering its icon"
-msgstr ""
+msgstr "Aperçu des images lors du survol de l’icône"
 
 msgid "Cut off sequences at download bounds"
 msgstr ""
@@ -28318,6 +28971,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importer"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28329,13 +28985,13 @@ msgid "Images from my file system"
 msgstr ""
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Sélectionnez les images que vous souhaitez importer"
 
 msgid "All images in a directory"
 msgstr ""
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Sélectionnez le répertoire pour importer des images de"
 
 msgid "From existing image layer"
 msgstr ""
@@ -28357,12 +29013,14 @@ msgid ""
 "Do you really want to replace the current value <i>{0}</i> with the new "
 "value <i>{1}</i>?"
 msgstr ""
+"Voulez-vous vraiment remplacer la valeur actuelle <i> {0} </ i> par la "
+"nouvelle valeur <i> {1} </ i>?"
 
 msgid "Tag conflict"
-msgstr ""
+msgstr "Tag en conflit"
 
 msgid "Key copied to clipboard"
-msgstr ""
+msgstr "Copier dans le Presse-papier"
 
 msgid ""
 "The Mapillary plugin now uses a separate panel to display extra information "
@@ -28376,13 +29034,15 @@ msgid ""
 msgstr ""
 
 msgid "I got it, close this."
-msgstr ""
+msgstr "J’ai compris. Fermez cela."
 
 msgid "Image info"
 msgstr ""
 
 msgid "Displays detail information on the currently selected Mapillary image"
 msgstr ""
+"Affiche des informations détaillées sur l’image Mapillary actuellement "
+"sélectionnée"
 
 msgid "Show detections on top of image"
 msgstr ""
@@ -28391,10 +29051,10 @@ msgid "View in browser"
 msgstr ""
 
 msgid "Copy key"
-msgstr ""
+msgstr "Copier la clé"
 
 msgid "Add Mapillary tag"
-msgstr ""
+msgstr "Ajouter un tag Mapillary"
 
 msgid "Image detections"
 msgstr ""
@@ -28403,22 +29063,22 @@ msgid "Image actions"
 msgstr ""
 
 msgid "Image key"
-msgstr ""
+msgstr "Clé de l’image"
 
 msgid "Sequence key"
-msgstr ""
+msgstr "Clé de la séquence"
 
 msgid "{0} detections"
 msgstr ""
 
 msgid "image has no key"
-msgstr ""
+msgstr "L,’image n’a pas de clé"
 
 msgid "unknown user"
-msgstr ""
+msgstr "Utilisateur inconnu"
 
 msgid "sequence has no key"
-msgstr ""
+msgstr "La séquence n’a pas de clé"
 
 msgid "Could not open the URL {0} in a browser"
 msgstr ""
@@ -28427,19 +29087,21 @@ msgid "Downloading map objects…"
 msgstr ""
 
 msgid "All map objects loaded."
-msgstr ""
+msgstr "Tous les objets  sont téléchargés."
 
 msgid "Too many map objects, zoom in to see all."
-msgstr ""
+msgstr "Tous les objets ne peuvent être affichés, zoomez pour voir tout."
 
 msgid "Downloading map objects failed!"
-msgstr ""
+msgstr "Le téléchargement des objets a échoué!"
 
 msgid "Mapillary objects"
-msgstr ""
+msgstr "Objets Mapillary"
 
 msgid "Displays objects detected by Mapillary from their street view imagery"
 msgstr ""
+"Affiche les objets détectés par Mapillary à partir de leur image de vue de "
+"rue"
 
 msgid "Deleted {0} image"
 msgid_plural "Deleted {0} images"
@@ -28477,13 +29139,13 @@ msgid ""
 msgstr ""
 
 msgid "everything in the visible area"
-msgstr ""
+msgstr "Tout est dans la zone visible"
 
 msgid "areas with downloaded OSM-data"
-msgstr ""
+msgstr "Zones avec données OSM téléchargées"
 
 msgid "only when manually requested"
-msgstr ""
+msgstr "Uniquement lorsque demandé manuellement"
 
 msgid ""
 "The downloaded OSM area is too big. Download mode has been changed to OSM "
@@ -29294,6 +29956,8 @@ msgid ""
 "Automatically try to find the correct address via Austria Address Helper "
 "plugin"
 msgstr ""
+"Essayez automatiquement de trouver l’adresse correcte via le plugin Austria "
+"Address Helper"
 
 msgid "Debug"
 msgstr "Débogueur"
@@ -29301,6 +29965,29 @@ msgstr "Débogueur"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Le mode débogage écrira des images à chaque étape du traitement."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29310,17 +29997,21 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
-msgid "Successfully added address to selected object:"
+msgid "No address type selected. Aborting."
 msgstr ""
 
+msgid "Successfully added address to selected object:"
+msgstr "Adresse ajoutée avec succès à l’objet sélectionné:"
+
 msgid "Distance between building center and address coordinates:"
 msgstr ""
+"Distance entre le centre du bâtiment et les coordonnées de l’adresse:"
 
 msgid "No address was found for this object."
-msgstr ""
+msgstr "Aucune adresse n’a été trouvée pour cet objet."
 
 msgid "An unexpected exception occurred:"
-msgstr ""
+msgstr "Une erreur inattendue s’est produite:"
 
 msgid "Building Generalization"
 msgstr ""
@@ -29330,9 +30021,12 @@ msgid ""
 "converted to rectangular ones. Angles between 84-96 degrees are converted to "
 "90 degrees."
 msgstr ""
+"Les débutants dessinent des lignes souvent très inexactes. Ces bâtiments "
+"doivent être convertis en rectangulaires. Les angles entre 84 et 96 degrés "
+"sont convertis en angles droits."
 
 msgid "There is no frame loaded !"
-msgstr ""
+msgstr "Il n’y a pas de cadre chargé!"
 
 msgid "Alert Message"
 msgstr "Message d’alerte"
@@ -30104,7 +30798,7 @@ msgid "Remove selected matches"
 msgstr "Supprimer les correspondances sélectionnées"
 
 msgid "Remove ({0})"
-msgstr ""
+msgstr "Supprimer ({0})"
 
 msgid "Conflate"
 msgstr "Assembler"
@@ -30173,13 +30867,13 @@ msgid "Interrupted Sequence ({0}/{1}): {2}"
 msgstr ""
 
 msgid " Max: "
-msgstr ""
+msgstr " Max: "
 
 msgid "Filter by area. Min: "
-msgstr ""
+msgstr "Filtrer par zone. Min: "
 
 msgid "Filter by window. Buffer: "
-msgstr ""
+msgstr "Filtrer par fenêtre. Tampon: "
 
 msgid "Union up to "
 msgstr ""
@@ -31504,19 +32198,19 @@ msgid "Activates the plug-in"
 msgstr "Active le greffon"
 
 msgid "Working Level"
-msgstr ""
+msgstr "Niveau de travail"
 
 msgid "Selects the working level."
-msgstr ""
+msgstr "Sélectionne le niveau de travail."
 
 msgid "Level Name"
-msgstr ""
+msgstr "Nom du niveau"
 
 msgid "Optional name-tag for a level."
-msgstr ""
+msgstr "Étiquette de nom facultative pour un niveau."
 
 msgid "The object preset you want to tag."
-msgstr ""
+msgstr "L’objet sélectionné que vous voulez taguer."
 
 msgid "Sets the name tag when the room-object is selected."
 msgstr ""
@@ -31525,7 +32219,7 @@ msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
 msgid "Apply Tags"
-msgstr ""
+msgstr "Appliquer le tag"
 
 msgid "Fitting"
 msgstr ""
@@ -31537,22 +32231,22 @@ msgid ""
 msgstr ""
 
 msgid "Level Selection"
-msgstr ""
+msgstr "Sélection du niveau"
 
 msgid "Lowest Level"
-msgstr ""
+msgstr "Le plus bas niveau"
 
 msgid "The lowest level of your building."
 msgstr ""
 
 msgid "Highest Level"
-msgstr ""
+msgstr "Le plus haut niveau"
 
 msgid "The highest level of your building."
-msgstr ""
+msgstr "Le plus haut niveau du bâtiment"
 
 msgid "Toolbox for indoor mapping assistance"
-msgstr ""
+msgstr "Boîte à outils pour l’assistance cartographique intérieure"
 
 msgid "InfoMode"
 msgstr "ModeInfo"
@@ -31695,7 +32389,7 @@ msgid "generate all combinations from entrie/exit candidates"
 msgstr "générer toutes les combinaisons de candidats entrée/sortie"
 
 msgid "Check the direction"
-msgstr ""
+msgstr "Vérifiez la direction"
 
 msgid ""
 "Check the direction of the selected stream/river. Is it correct?\n"
@@ -31718,7 +32412,7 @@ msgid "<HTML><U>W</U>rong dirrection</HTML>"
 msgstr ""
 
 msgid "Direction of river is wrong."
-msgstr ""
+msgstr "Le sens de l’écoulement de l’eau est incorrect"
 
 msgid "<HTML><U>I</U>gnore this way</HTML>"
 msgstr ""
@@ -31736,7 +32430,7 @@ msgid "No more directions to check!"
 msgstr ""
 
 msgid "Replace way"
-msgstr ""
+msgstr "Remplacer le chemin"
 
 msgid "Replace way of selected way with a new way"
 msgstr ""
@@ -33448,13 +34142,13 @@ msgid "Add stop position"
 msgstr ""
 
 msgid "Repeat last fix"
-msgstr ""
+msgstr "Répéter la dernière correction"
 
 msgid "Do you want to download referrers of platforms and stop positions?"
-msgstr ""
+msgstr "Voulez-vous télécharger les références de plateformes et des arrêts?"
 
 msgid "Remember my choice and do not ask me again in this session"
-msgstr ""
+msgstr "Se souvenir de mon choix et ne plus me demandez pour cette session"
 
 msgid "PT_Assistant Fetch Request"
 msgstr ""
@@ -33464,12 +34158,15 @@ msgid ""
 "They need to be downloaded to proceed with validation.\n"
 "Do you want to download them?"
 msgstr ""
+"Les relations d’itinéraire ont des membres incomplets.\n"
+"Ils doivent être téléchargés pour procéder à la validation.\n"
+"Voulez-vous les télécharger?"
 
 msgid "Download incomplete route relation members"
-msgstr ""
+msgstr "Télécharger les membres incomplets de la relation d’itinéraire"
 
 msgid "Include stop_area tests"
-msgstr ""
+msgstr "Inclure les tests stop_area"
 
 msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
 msgstr ""
@@ -33508,59 +34205,73 @@ msgstr ""
 msgid ""
 "Check if route relations are compatible with public transport version 2"
 msgstr ""
+"Vérifiez si les relations de route sont compatibles avec les "
+"public_transport:version 2"
 
 msgid "Fix error"
-msgstr ""
+msgstr "Correction d’erreur"
 
 msgid "PT: dummy test warning"
 msgstr ""
 
 msgid "PT: Route contains a gap that can be fixed by sorting"
-msgstr ""
+msgstr "PT: L’itinéraire contient un trou qui peut être corrigé par un tri"
 
 msgid "PT: Relation member roles do not match tags"
 msgstr ""
+"PT: Les rôles des membres de la relations ne correspondent pas aux tags"
 
 msgid "PT: Route should start and end with a stop_position"
-msgstr ""
+msgstr "PT: l’itinéraire doit commencer et se terminer par stop_position"
 
 msgid "PT: First or last way needs to be split"
-msgstr ""
+msgstr "PT: Le premier ou la dernier chemin doit être divisé"
 
 msgid "PT: Stop not served"
 msgstr ""
 
 msgid "PT: Problem in the route segment with no automatic fix"
 msgstr ""
+"PT: Problème dans le segment d’itinéraire sans correction automatique"
 
 msgid "PT: Problem in the route segment with one automatic fix"
 msgstr ""
+"PT: problème dans le segment d’itinéraire avec une correction automatique"
 
 msgid "Warning: the diplayed fix variants are based on less strict criteria"
 msgstr ""
+"Avertissement: les variantes de correction affichées sont basées sur des "
+"critères moins stricts"
 
 msgid "Type letter to select the fix variant or press Escape for no fix"
 msgstr ""
+"Tapez une lettre pour sélectionner la variante de correction ou appuyez sur "
+"Echap pour aucune correction"
 
 msgid "PT: Stop area relation has no stop position"
-msgstr ""
+msgstr "PT: La relation de zone d’arrêt n’a pas de stop position"
 
 msgid "PT: Stop area relation has no platform"
-msgstr ""
+msgstr "PT: la relation de zone d’arrêt n’a pas de plateforme"
 
 msgid ""
 "PT: Route relations of stop position(s) and platform(s) of stop area members "
 "diverge"
 msgstr ""
+"PT: Les relations d’itinéraire de la (des) positions d’arrêt et la (les) "
+"plateforme(s) d’éléments de zone d’arrêt divergent"
 
 msgid "PT: Route type does not match the type of the road it passes on"
 msgstr ""
+"PT: Le type d’itinéraire ne correspond pas au type de route sur lequel il "
+"passe"
 
 msgid "PT: Road is under construction"
-msgstr ""
+msgstr "PT: la route est en construction"
 
 msgid "PT: Route passes a oneway road in the wrong direction"
 msgstr ""
+"PT: l’itinéraire passe une route à sens unique dans la mauvaise direction"
 
 msgid "moved"
 msgstr "déplacé"
@@ -33820,10 +34531,10 @@ msgid "Public Transport: Edit waypoint name"
 msgstr "Transport public : modifier le nom d’un point de chemin"
 
 msgid "Distance between stops"
-msgstr ""
+msgstr "Distance entre les arrêts"
 
 msgid "A valid public_transport:version=2 route is required"
-msgstr ""
+msgstr "Un tag public_transport:version=2 route est requis"
 
 msgid "Invalid selection"
 msgstr "La sélection n’est pas valide"
@@ -34158,25 +34869,6 @@ msgstr "Signalisation {0}"
 msgid "Additional sign {0}"
 msgstr "Signalisation supplémentaire {0}"
 
-msgid "Edit relation"
-msgstr "Modifier la relation"
-
-msgid "Edit relations"
-msgstr "Modifier les relations"
-
-msgid "No relation is selected"
-msgstr "Aucune relation sélectionnée"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Supprimer le nœud ''{0}'' à la position {1} de la relation ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Supprimer le chemin ''{0}'' à la position {1} de la relation ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
-
 msgid "routing active route"
 msgstr "traçage d''itinéraire actif"
 
@@ -34402,7 +35094,7 @@ msgid "Select building"
 msgstr "Selectionner un bâtiment"
 
 msgid "Select road"
-msgstr ""
+msgstr "Sélectionner la route"
 
 msgid "Select none"
 msgstr ""
@@ -35299,13 +35991,13 @@ msgid "check the right direction of the way"
 msgstr ""
 
 msgid "Unidirectional road"
-msgstr ""
+msgstr "Construire une voie dans un sens de circulation"
 
 msgid "Build unidirectional road"
 msgstr ""
 
 msgid "Bidirectional road"
-msgstr ""
+msgstr "Voie dans les deux sens de circulation"
 
 msgid "Build bidirectional road"
 msgstr ""
@@ -36833,7 +37525,7 @@ msgid "Search Wikipedia category"
 msgstr ""
 
 msgid "Load category"
-msgstr ""
+msgstr "Catéforie de téléchargement"
 
 msgid "Fetch Wikipedia articles with coordinates"
 msgstr "Récupérer les articles Wikipédia avec des coordonnées"
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index 8e748c6..e0d3e38 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-05-17 11:43+0000\n"
 "Last-Translator: Thorsten <Unknown>\n"
 "Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:47+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:48+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 0edaa9c..6942023 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-01-01 15:11+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:47+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:48+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: gl\n"
 "X-Poedit-Language: Galician\n"
 
@@ -5636,6 +5636,26 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "A version de eles({0} entrada)"
 msgstr[1] "A version de eles({0} entradas)"
 
+msgid "My version (local dataset)"
+msgstr "A miña versión (conxunto de datos locais)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Propiedades do meu conxunto de datos, p.e. o conxunto de datos local"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propiedades no elemento combinado. Substituirán as propiedades dos elementos "
+"propios cando se apliquen as decisións de combinación."
+
+msgid "Their version (server dataset)"
+msgstr "A súa versión (conxunto de cambios do servidor)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Propiedades no seu conxunto de datos, p.ex. o conxunto de cambios do servidor"
+
 msgid "My with Their"
 msgstr "O meu deles"
 
@@ -5724,29 +5744,6 @@ msgstr ""
 "Os nodos combinados aínda non están conxelados. Non é posíbel construír a "
 "orde de resolución."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Propiedades do meu conxunto de datos, p.e. o conxunto de datos local"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propiedades no elemento combinado. Substituirán as propiedades dos elementos "
-"propios cando se apliquen as decisións de combinación."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propiedades no seu conxunto de datos, p.ex. o conxunto de cambios do servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenadas:"
-
-msgid "Deleted State:"
-msgstr "Estado eliminado:"
-
-msgid "Referenced by:"
-msgstr "Referenciado por:"
-
 msgid "(none)"
 msgstr "(ningún)"
 
@@ -5756,6 +5753,15 @@ msgstr "eliminado"
 msgid "not deleted"
 msgstr "non eliminado"
 
+msgid "Deleted State:"
+msgstr "Estado eliminado:"
+
+msgid "Coordinates:"
+msgstr "Coordenadas:"
+
+msgid "Referenced by:"
+msgstr "Referenciado por:"
+
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5802,12 +5808,6 @@ msgstr "Tecla"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "A miña versión (conxunto de datos locais)"
-
-msgid "Their version (server dataset)"
-msgstr "A súa versión (conxunto de cambios do servidor)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Manter a parexa clave/valor escollida do conxunto de cambios locais"
 
@@ -10500,9 +10500,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12256,7 +12253,7 @@ msgstr "PUWG Zona"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suíza)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13552,7 +13549,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14721,9 +14723,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14733,9 +14732,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14746,9 +14742,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15333,6 +15337,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15360,6 +15370,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15390,6 +15403,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15438,21 +15454,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15494,15 +15521,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15518,6 +15560,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15623,9 +15671,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15635,6 +15689,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15719,9 +15776,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15737,31 +15821,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15780,13 +15893,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15795,21 +15908,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15828,6 +15951,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15840,6 +15966,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Catastro"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15967,16 +16096,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16009,15 +16143,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16029,15 +16173,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16098,18 +16258,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16173,18 +16352,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16218,26 +16408,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16247,15 +16446,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16263,6 +16476,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16401,23 +16617,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16444,18 +16672,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16489,6 +16733,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16567,12 +16814,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16628,8 +16883,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16653,345 +16908,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23610,6 +24251,9 @@ msgstr "Pescado"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (Boa comida)"
 
@@ -25855,6 +26499,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26827,6 +27474,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27680,6 +28330,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27689,6 +28362,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32254,24 +32930,6 @@ msgstr "Asinar {0}"
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Editar relación"
-
-msgid "Edit relations"
-msgstr "Editar relacións"
-
-msgid "No relation is selected"
-msgstr "Non hai relación seleccionadas"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Retirar o nodo «{0}» na posición {1} da relación «{2}»"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Retirar a vía  «{0}» na posición {1} da relación «{2}»"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Retirar a relación «{0}» na posición {1} da relación «{2}»"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 625bacd..004e641 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2013-03-30 13:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:49+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:50+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: he\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5416,6 +5416,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr "הגרסה שלהם (הנתונים על השרת)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr "שלי עם שלהם"
 
@@ -5498,35 +5515,24 @@ msgstr "נקודה"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgid "(none)"
+msgstr "(לא כלום)"
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
+msgid "deleted"
+msgstr "מחוק"
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "not deleted"
+msgstr "לא נמחק"
+
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "קואורדינטות:"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr "(לא כלום)"
-
-msgid "deleted"
-msgstr "מחוק"
-
-msgid "not deleted"
-msgstr "לא נמחק"
-
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5572,12 +5578,6 @@ msgstr "מפתח"
 msgid "Value"
 msgstr "ערך"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr "הגרסה שלהם (הנתונים על השרת)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10153,9 +10153,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11852,7 +11849,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13123,7 +13120,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14240,9 +14242,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14252,9 +14251,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14265,9 +14261,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14852,6 +14856,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14879,6 +14889,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14909,6 +14922,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14957,21 +14973,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15013,15 +15040,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15037,6 +15079,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15142,9 +15190,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15154,6 +15208,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15238,9 +15295,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15256,31 +15340,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15299,13 +15412,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15314,21 +15427,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15347,6 +15470,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15359,6 +15485,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15486,16 +15615,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15528,15 +15662,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15548,15 +15692,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15617,18 +15777,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15692,18 +15871,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15737,26 +15927,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15766,15 +15965,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15782,6 +15995,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15920,23 +16136,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15963,18 +16191,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16008,6 +16252,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16086,12 +16333,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16147,8 +16402,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16172,345 +16427,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23096,6 +23737,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25341,6 +25985,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26313,6 +26960,9 @@ msgstr ""
 msgid "Import"
 msgstr "ייבא"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27165,6 +27815,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27174,6 +27847,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31715,24 +32391,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 74dc8f7..654bb1f 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-11-14 16:28+0000\n"
 "Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
 "Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:49+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:51+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: hi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index f27a9ea..fa05025 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-01-04 15:56+0000\n"
 "Last-Translator: gogo <trebelnik2 at gmail.com>\n"
 "Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:06+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:07+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: hr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5500,6 +5500,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5582,35 +5599,24 @@ msgstr "Točka"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
+msgid "(none)"
 msgstr ""
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
+msgid "deleted"
+msgstr "izbrisano"
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "not deleted"
+msgstr "neizbrisano"
+
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "Koordinate:"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
-msgstr "izbrisano"
-
-msgid "not deleted"
-msgstr "neizbrisano"
-
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5656,12 +5662,6 @@ msgstr ""
 msgid "Value"
 msgstr "Vrijednost"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10266,9 +10266,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11965,7 +11962,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13234,7 +13231,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14351,9 +14353,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14363,9 +14362,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14376,9 +14372,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14961,6 +14965,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14988,6 +14998,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15018,6 +15031,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15066,21 +15082,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15122,15 +15149,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15146,6 +15188,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15251,9 +15299,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15263,6 +15317,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15347,9 +15404,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15365,31 +15449,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15408,13 +15521,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15423,21 +15536,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15456,6 +15579,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15468,6 +15594,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15595,16 +15724,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15637,15 +15771,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15657,15 +15801,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15726,18 +15886,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15801,18 +15980,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15846,26 +16036,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15875,15 +16074,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15891,6 +16104,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16029,23 +16245,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16072,18 +16300,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16117,6 +16361,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16195,12 +16442,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16256,8 +16511,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16281,345 +16536,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23205,6 +23846,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25450,6 +26094,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26422,6 +27069,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27274,6 +27924,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27283,6 +27956,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31824,24 +32500,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Uredi relaciju"
-
-msgid "Edit relations"
-msgstr "Uredi relacije"
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 248816d..e912306 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2010-03-11 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:48+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:49+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 806b1a6..ebf52e7 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-03-29 22:46+0000\n"
-"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-27 22:06+0000\n"
+"Last-Translator: Gábor Babos <Unknown>\n"
 "Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:50+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:51+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: hu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -67,13 +67,13 @@ msgid "Help"
 msgstr "Súgó"
 
 msgid "Initializing internal boundaries data"
-msgstr "Határvonal adatok inicializálása"
+msgstr "Belső határvonal adatok előkészítése"
 
 msgid "Initializing OSM API"
 msgstr "OSM API előkészítése"
 
 msgid "Initializing internal traffic data"
-msgstr "Belső forgalmi adatok inicializálása"
+msgstr "Belső forgalmi adatok előkészítése"
 
 msgid "Initializing validator"
 msgstr "Ellenőrző előkészítése"
@@ -189,7 +189,7 @@ msgstr "Böngészőablakok megnyitásának megszakítása."
 
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
-"Válassz ki legalább egy már feltöltött pontot, vonalat vagy kapcsolatot."
+"Jelölj ki legalább egy már feltöltött pontot, vonalat vagy kapcsolatot."
 
 msgid "Please select the target layer."
 msgstr "Jelöld ki a célréteget."
@@ -211,38 +211,39 @@ msgid "No target layers"
 msgstr "Nincs célréteg"
 
 msgid "Select"
-msgstr "Kiválaszt"
+msgstr "Kijelölés"
 
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr "Kiválasztja a térképen a fenti listában kijelölt elemeket."
+msgstr ""
+"A térképen kijelölt elemeket beállítása a fenti listában kijelölt tétekelekre"
 
 msgid "Select WMS layers"
-msgstr "Válassz WMS réteget"
+msgstr "WMS rétegek kijelölése"
 
 msgid "Add layers"
 msgstr "Rétegek hozzáadása"
 
 msgid "Add imagery layer {0}"
-msgstr "Légifelvétel réteg hozzáadása: {0}"
+msgstr "Légifelvétel-réteg hozzáadása: {0}"
 
 msgid "Invalid service URL."
 msgstr "Érvénytelen szolgáltatáscím."
 
 msgid "WMS Error"
-msgstr "WMS Hiba"
+msgstr "WMS hiba"
 
 msgid "Could not retrieve WMS layer list."
-msgstr "WMS réteglista nem kinyerhető."
+msgstr "A WMS réteglista nem nyerhető ki."
 
 msgid "Could not parse WMS layer list."
-msgstr "WMS réteglista nem értelmezhető."
+msgstr "A WMS réteglista nem értelmezhető."
 
 msgid "Error"
 msgstr "Hiba"
 
 msgid "Select image format for WMS layer"
-msgstr "Válassz képformátumot a WMS réteghez"
+msgstr "Képformátum kijelölése a WMS réteghez"
 
 msgid "Add Node..."
 msgstr "Pont hozzáadása..."
@@ -258,19 +259,19 @@ msgid "Align Nodes in Circle"
 msgstr "Pontok elrendezése kör mentén"
 
 msgid "Move the selected nodes into a circle."
-msgstr "A kiválasztott pontok elhelyezése egy kör mentén."
+msgstr "A kijelölt pontok elhelyezése egy kör mentén."
 
 msgid "Tool: {0}"
 msgstr "Eszköz: {0}"
 
 msgid "Not enough nodes in selected ways."
-msgstr "Nincs elég pont a kiválasztott vonalakon."
+msgstr "Nincs elég pont a kijelölt vonalakon."
 
 msgid "Please select at least four nodes."
 msgstr "Jelölj ki legalább négy pontot."
 
 msgid "Cannot determine center of selected nodes."
-msgstr "Nem lehet megállapítani a kiválasztot pontok középpontját."
+msgstr "Nem lehet megállapítani a kijelölt pontok középpontját."
 
 msgid ""
 "One or more nodes involved in this action is outside of the downloaded area."
@@ -282,10 +283,10 @@ msgid "Align Nodes in Line"
 msgstr "Pontok elrendezése egyenes mentén"
 
 msgid "Move the selected nodes in to a line."
-msgstr "A kiválasztott pontok elhelyezése egy egyenes mentén."
+msgstr "A kijelölt pontok elhelyezése egy egyenes mentén."
 
 msgid "Please select at least three nodes."
-msgstr "Válassz ki legalább három pontot."
+msgstr "Jelölj ki legalább három pontot."
 
 msgid "Can not align a polygon. Abort."
 msgstr "A poligont nem lehet igazítani. Megszakítva."
@@ -396,7 +397,7 @@ msgstr[0] "{0} vonal egyesítése"
 msgstr[1] "{0} vonal egyesítése"
 
 msgid "Please select at least two ways to combine."
-msgstr "Válassz ki legalább két vonalat az egyesítéshez."
+msgstr "Jelölj ki legalább két vonalat az egyesítéshez."
 
 msgid "Copy"
 msgstr "Másolás"
@@ -417,14 +418,14 @@ msgid "Create Circle"
 msgstr "Kör létrehozása"
 
 msgid "Create a circle from three selected nodes."
-msgstr "Kör létrehozása három kiválasztott pontból."
+msgstr "Kör létrehozása három kijelölt pontból."
 
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
 msgstr ""
-"Válassz ki pontosan két vagy három pontot, vagy egy pontosan két vagy három "
-"ponttal rendelkező vonalat."
+"Jelölj ki pontosan két vagy három pontot, vagy egy pontosan két vagy három "
+"pontból álló vonalat."
 
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "A pontok nem egy kör mentén helyezkednek el. Megszakítás."
@@ -439,7 +440,7 @@ msgid "No data loaded."
 msgstr "Nincs betöltve adat."
 
 msgid "You must select at least one way."
-msgstr "Legalább egy vonalat ki kell választani."
+msgstr "Legalább egy vonalat ki kell jelölni."
 
 msgid "Delete"
 msgstr "Törlés"
@@ -481,7 +482,7 @@ msgid "Download from OSM..."
 msgstr "Letöltés OSM-ről..."
 
 msgid "Download map data from the OSM server."
-msgstr "Térképadatok letöltése az OSM-szerverről."
+msgstr "Térképadatok letöltése az OSM kiszolgálóról."
 
 msgid ""
 "<html>This action will require {0} individual<br>download requests. Do you "
@@ -500,7 +501,7 @@ msgid "Download in current view"
 msgstr "Aktuális nézet letöltése"
 
 msgid "Download map data from the OSM server in current view"
-msgstr "A jelenlegi nézet térképadatainak letöltése az OSM-szerverről"
+msgstr "A jelenlegi nézet térképadatainak letöltése az OSM kiszolgálóról"
 
 msgid "Download object..."
 msgstr "Objektumok letöltése…"
@@ -512,7 +513,7 @@ msgid "Download parent ways/relations..."
 msgstr "Szülővolalak/-kapcsolatok letöltése..."
 
 msgid "Download objects referring to one of the selected objects"
-msgstr "A kiválasztott objektumokhoz kapcsolódó egyéb objektumok letöltése."
+msgstr "Az egyik kijelölt objektumra hivatkozó objektumok letöltése."
 
 msgid "Duplicate"
 msgstr "Kettőzés"
@@ -633,28 +634,29 @@ msgstr ""
 "kapcsolatokról a böngészőben."
 
 msgid "Join overlapping Areas"
-msgstr "Átfedő területek egyesítése"
+msgstr "Átfedő területek összekapcsolása"
 
 msgid "Joins areas that overlap each other"
 msgstr "Egymást átfedő területek egy területté alakítása"
 
 msgid "Please select at least one closed way that should be joined."
-msgstr "Válassz ki legalább egy zárt vonalat, amelyet egyesíteni szeretnél."
+msgstr ""
+"Jelölj ki legalább egy zárt vonalat, amelyet össze szeretnél kapcsolni."
 
 msgid ""
 "One of the selected ways is not closed and therefore cannot be joined."
-msgstr "A kiválasztott vonalak egyike nem zárt, így nem egyesíthető."
+msgstr "Az egyik kiválasztott vonal nem zárt, ezért nem kapcsolható össze"
 
 msgid "Join area confirmation"
-msgstr "Területek egyesítésének megerősítése"
+msgstr "Területek összekapcsolásának megerősítése"
 
 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] ""
-"A kiválasztott vonalnak a letöltött területen kívül is vannak pontjai."
+"A kijelölt vonalnak a letöltött területen kívül is vannak pontjai."
 msgstr[1] ""
-"A kiválasztott vonalaknak a letöltött területen kívül is vannak pontjai."
+"A kijelölt vonalaknak a letöltött területen kívül is vannak pontjai."
 
 msgid "This can lead to nodes being deleted accidentally."
 msgstr "Ez egyes pontok nem szándékos törléséhez vezethet."
@@ -666,7 +668,7 @@ msgid "Please abort if you are not sure"
 msgstr "Szakítsd meg a műveletet, ha nem vagy biztos az eredményében"
 
 msgid "The selected area is incomplete. Continue?"
-msgstr "A kiválasztott terület félkész. Folytatod?"
+msgstr "A kijelölt terület nincs készen. Folytatod?"
 
 msgid "No intersection found. Nothing was changed."
 msgstr "Nem találhatók átfedések. Nem történt változtatás."
@@ -693,7 +695,7 @@ msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Vonalak törlése amelyek nem részei egy belső multipoligonnak"
 
 msgid "Joined overlapping areas"
-msgstr "Csatlakoztatott átfedések"
+msgstr "Összekapcsolt átfedő területek"
 
 msgid ""
 "Some of the ways were part of relations that have been modified.<br>Please "
@@ -739,10 +741,10 @@ msgid "Remove tags from inner ways"
 msgstr "Címkék eltávolítása a belső vonalakról"
 
 msgid "Join Areas Function"
-msgstr "Területek egyesítése funkció"
+msgstr "Területek összekapcsolása funkció"
 
 msgid "Join Node to Way"
-msgstr "Pont egyesítése a vonallal"
+msgstr "Pont vonalhoz kapcsolása"
 
 msgid "Include a node into the nearest way segments"
 msgstr "Beilleszti a pontot a legközelebbi vonalszakaszba"
@@ -831,7 +833,7 @@ msgid ""
 "Couldn''t match the entered link or id to the selected service. Please try "
 "again."
 msgstr ""
-"A beírt link vagy ID nem megfelelő a kiválasztott szolgáltatáshoz. Próbáld "
+"A beírt link vagy ID nem megfelelő a kijelölt szolgáltatáshoz. Próbáld meg "
 "újra."
 
 msgid "No valid WMS URL or id"
@@ -879,8 +881,8 @@ msgid ""
 "Please select at least two nodes to merge or one node that is close to "
 "another node."
 msgstr ""
-"Válassz legalább két  egyesítendő pontot, vagy egy pontot, ami közel van egy "
-"másikhoz."
+"Jelölj legalább két egyesítendő pontot, vagy egy olyan pontot, amely közel "
+"van egy másikhoz."
 
 msgid "Abort Merging"
 msgstr "Egyesítés megszakítása"
@@ -891,8 +893,8 @@ msgstr "Kattints a pontok egybeolvasztásának megszakításához"
 msgid ""
 "Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
 msgstr ""
-"A pontok nem egyesíthetők. A vonal törlésére lenne szükség: {0}, de azt még "
-"használja: {1}"
+"A pontok nem egyesíthetők: ehhez törölni kellene a(z) {0} vonalat, amelyet "
+"viszont még a(z) {1} használ."
 
 msgid "Merge {0} node"
 msgid_plural "Merge {0} nodes"
@@ -903,7 +905,7 @@ msgid "Merge selection"
 msgstr "Kijelölés egyesítése"
 
 msgid "Merge the currently selected objects into another layer"
-msgstr "A kiválasztott objektumok egyesítése egy másik rétegre"
+msgstr "A jelenleg kijelölt objektumok egyesítése egy másik rétegre"
 
 msgid "Merging too many objects with different upload policies"
 msgstr "Túl sok objektum egyesítése eétérő feltöltési szabályokkal"
@@ -915,9 +917,9 @@ msgid ""
 "one</b>.<br /><br />Are you sure you want to continue?"
 msgstr ""
 "Több, mint 1 objektum egyesítésére készülsz ''{0}'' és ''{1}''  rétegek "
-"között.<br /><br /><b>Ez nem a ajánlott módja az ilyen adatok "
-"egyesítésének.</b><br />Ehelyett ellenőrizd és egyesítsd az objektumokat "
-"<b>egyesével</b>.<br /><br />Biztosan folytatod?"
+"között.<br /><br /><b>Az ilyen adatok egyesítésének nem ez az ajánlott "
+"módja.</b><br />Inkább ellenőrizd és egyesítsd az objektumokat "
+"<b>egyenként</b>.<br /><br />Biztosan folytatod?"
 
 msgid "Mirror"
 msgstr "Tükrözés"
@@ -1002,7 +1004,7 @@ msgstr "nem létezik"
 
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
-"<html>Könyvtár nem megnyitható ''{0}''.<br>Kérem válasszon egy fájlt.</html>"
+"<html>Könyvtár nem nyitható meg ''{0}''.<br>Jelölj ki egy fájlt.</html>"
 
 msgid "Open file"
 msgstr "Fájl megnyitása"
@@ -1068,12 +1070,12 @@ msgid ""
 "can undo the movement for certain nodes:<br>Select them and press the "
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>Ha egy vagy több vonal ki van választva, azokat úgy rendezi el a "
-"program, hogy minden szög 90 vagy 180 fokot zárjon be.</h3>Ha két pont is ki "
-"van választva, akkor az irányt ez a két referencia pont fogja megadni. (A "
-"művelet után visszavonható az egyes pontok mozgatása:<br>Válaszd ki a kívánt "
-"pontot vagy pontokat, majd nyomd meg a Derékszögesítés Visszavonása "
-"billentyűt - alapértelmezésben a Shift-Q.)"
+"<h3>Ha egy vagy több vonal ki van jelölve, azokat úgy rendezi el a program, "
+"hogy minden szög 90 vagy 180 fokot zárjon be.</h3>Két pontot hozzáadhatsz a "
+"kijelöléshez. Ekkor ez a két referenciapont szabja meg az irányt. (A művelet "
+"után visszavonható az egyes pontok mozgatása:<br>Jelöld ki a pontokat, majd "
+"nyomd meg a Derékszögesítés / Visszavonás billentyűparancsot; "
+"alapértelmezésben Shift-Q.)"
 
 msgid "Orthogonalize Shape"
 msgstr "Alakzat derékszögesítése"
@@ -1094,8 +1096,8 @@ msgid ""
 "Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
 "previous Orthogonalize Shape action!"
 msgstr ""
-"Alakzat derékszögesítése / Visszavonás<br>Válassz ki olyan pontokat, amiket "
-"az előző Alakzat derékszögesítése művelet elmozdított!"
+"Alakzat derékszögesítése / Visszavonás<br>Jelöld ki azokat a pontokat, "
+"amelyeket az előző Alakzat derékszögesítése művelet elmozdított!"
 
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1113,25 +1115,25 @@ msgid "Usage"
 msgstr "Használat"
 
 msgid "Selection must consist only of ways and nodes."
-msgstr "Csak pontok és vonalak lehetnek kiválasztva"
+msgstr "Csak pontokat és vonalakat lehet kijelölni."
 
 msgid ""
 "<html>Please make sure all selected ways head in a similar direction<br>or "
 "orthogonalize them one by one.</html>"
 msgstr ""
-"<html>Minden kiválasztott vonalnak hasonló irányba kell mutatnia<br>vagy "
+"<html>Minden kijelölt vonalnak hasonló irányba kell mutatnia,<br>vagy "
 "egyesével kell őket derékszögesíteni.</html>"
 
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
-"Olyan vonalakat válassz ki, amelyek nagyjából 90 vagy 180 fokos szöget "
-"zárnak be."
+"Olyan vonalakat jelölj ki, amelyek nagyjából 90 vagy 180 fokos szöget zárnak "
+"be."
 
 msgid "Download from Overpass API ..."
 msgstr "Letöltés Overpass API-ról ..."
 
 msgid "Download map data from Overpass API server."
-msgstr "Térképadatok letöltése az Overpass API szerverről."
+msgstr "Térképadatok letöltése az Overpass API kiszolgálóról."
 
 msgid "Builds an Overpass query using the Overpass Turbo query wizard"
 msgstr ""
@@ -1185,7 +1187,7 @@ msgstr "Elfelejtés..."
 
 msgid "Forget objects but do not delete them on server when uploading."
 msgstr ""
-"Objektumok eltávolítása a rajzról úgy, hogy feltöltéskor a szerverről nem "
+"Objektumok eltávolítása a rajzról úgy, hogy feltöltéskor a kiszolgálóról nem "
 "fognak törlődni."
 
 msgid "Purge"
@@ -1199,18 +1201,18 @@ msgid ""
 "removed from the layer, but <i>not</i> deleted<br> on the server when "
 "uploading."
 msgstr ""
-"Ez a művelet a JOSM-ból eltávolítja a kiválasztott objektumokat<br>Törlődnek "
-"a rétegről, de <i>nem</i> törlődnek<br>a szerverről feltöltéskor."
+"Ezzel a művelettel a JOSM elfelejti a kijelölt objektumokat.<br>Törlődnek a "
+"rétegről, de <i>nem</i> törlődnek<br>a kiszolgálóról feltöltéskor."
 
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
 msgstr ""
-"A JOSM elfelejti a következő kapcsolódó objektumokat is<br>a kiválasztott "
-"objektumokon kívül:"
+"A kijelölt objektumokon kívül<br>a következő kapcsolódó objektumok is "
+"törlődnek:"
 
 msgid "Add to selection"
-msgstr "Hozzáadás a kiválasztáshoz"
+msgstr "Hozzáadás a kijelöléshez"
 
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1262,7 +1264,7 @@ msgid "Reverse the direction of all selected ways."
 msgstr "Az összes kijelölt vonal irányának megfordítása."
 
 msgid "Please select at least one way."
-msgstr "Válassz ki legalább egy vonalat."
+msgstr "Jelölj ki legalább egy vonalat."
 
 msgid "Reverse ways"
 msgstr "Vonalak megfordítása"
@@ -1304,20 +1306,20 @@ msgid "You must enter a search term"
 msgstr "Meg kell adnod keresési kifejezést"
 
 msgid "Select All"
-msgstr "Összes kiválasztása"
+msgstr "Összes kijelölése"
 
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
 "objects too."
 msgstr ""
-"Az adatréteg minden nem törölt objektumának kiválasztása. Ez kiválasztja a "
+"Az adatréteg minden nem törölt objektumának kijelölése. Ez kijelöli a "
 "félkész objektumokat is."
 
 msgid "Non-branching way sequences"
 msgstr "Nem elágazó vonalszakszok"
 
 msgid "Select non-branching sequences of ways"
-msgstr "Válaszd ki a vonalak nem elágazó szakaszait"
+msgstr "A vonalak nem elágazó szakaszainak kijelölése"
 
 msgid "Load Session"
 msgstr "Munkamenet betöltése"
@@ -1400,13 +1402,13 @@ msgid "Delete unnecessary nodes from a way."
 msgstr "A szükségtelen pontok törlése egy vonalról."
 
 msgid "Please select at least one way to simplify."
-msgstr "Az egyszerűsítéshez legalább egy vonalat ki kell választani."
+msgstr "Az egyszerűsítéshez legalább egy vonalat ki kell jelölni."
 
 msgid "Yes"
 msgstr "Igen"
 
 msgid "Simplify all selected ways"
-msgstr "A kiválasztott vonalak egyszerűsítése"
+msgstr "A kijelölt vonalak egyszerűsítése"
 
 msgid "Cancel operation"
 msgstr "Művelet megszakítása"
@@ -1414,7 +1416,7 @@ msgstr "Művelet megszakítása"
 msgid ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr ""
-"A kiválasztásban {0} vonal szerepel. Biztos, hogy mindet egyszerűsíted?"
+"A kijelölésben {0} vonal szerepel. Biztos, hogy mindet egyszerűsíted?"
 
 msgid "Simplify ways?"
 msgstr "Vonalak egyszerűsítése?"
@@ -1441,8 +1443,7 @@ msgstr "Nem lehet elvágni, mivel egy másik vágási művelet is folyamatban va
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
 msgstr ""
-"A jelenleg kiválasztott elemek alapján nem lehet vágni. Nincs pont "
-"kiválasztva."
+"A jelenleg kijelölt elemek alapján nem lehet elvágni. Nincs pont kijelölve."
 
 msgid "The selected nodes do not share the same way."
 msgstr "A kijelölt pontok nem azonos vonalon vannak."
@@ -1458,11 +1459,9 @@ msgid ""
 msgid_plural ""
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] ""
-"Több vonal is van, amelynek a kijelölt pont tagja. Válaszd ki a vonalat is."
+msgstr[0] "A kijelölt pont több vonalnak is tagja. Válaszd ki a vonalat is."
 msgstr[1] ""
-"Több vonal is van, amelynek a kijelölt pontok tagjai. Válaszd ki a vonalat "
-"is."
+"A kijelölt pontok több vonalnak is tagjai. Válaszd ki a vonalat is."
 
 msgid "Which way segment should reuse the history of {0}?"
 msgstr "Melyik vonalszakasz őrizze meg {0} vonal előzményeit?"
@@ -1533,7 +1532,7 @@ msgid "The current selection cannot be used for unglueing."
 msgstr "A jelenlegi kijelölést nem lehet szétválasztani."
 
 msgid "Select either:"
-msgstr "Válassz ki:"
+msgstr "Jelölj ki:"
 
 msgid "* One tagged node, or"
 msgstr "* egy címkézett pontot, vagy"
@@ -1639,21 +1638,19 @@ msgid "Disconnect nodes from a way they currently belong to"
 msgstr "Pont leválasztása arról a vonalról, amihez jelenleg kapcsolódik"
 
 msgid "Select at least one node to be disconnected."
-msgstr "Válassz ki legalább egy leválasztandó pontot."
+msgstr "Jelölj ki legalább egy leválasztandó pontot."
 
 msgid "Selected node cannot be disconnected from anything."
 msgid_plural "Selected nodes cannot be disconnected from anything."
-msgstr[0] "A kiválasztott pont nem választható le sehonnan."
-msgstr[1] "A kiválasztott pontok nem választhatóak le sehonnan."
+msgstr[0] "A kijelölt pont nem választható le sehonnan."
+msgstr[1] "A kijelölt pontok nem választhatóak le sehonnan."
 
 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] ""
-"Az érintett vonal eltűnne, ha leválasztanád a kiválasztott pontot."
-msgstr[1] ""
-"Az érintett vonal eltűnne, ha leválasztanád a kiválasztott pontokat."
+msgstr[0] "Az érintett vonal eltűnne, ha leválasztanád a kijelölt pontot."
+msgstr[1] "Az érintett vonal eltűnne, ha leválasztanád a kijelölt pontokat."
 
 msgid "Some irrelevant nodes have been removed from the selection"
 msgstr "Néhány lényegtelen pont el lett távolítva a kijelölésből"
@@ -1671,7 +1668,7 @@ msgid "Undo {0}"
 msgstr "{0} visszavonása"
 
 msgid "Unselect All"
-msgstr "Kiválasztás megszüntetése"
+msgstr "Kijelölés megszüntetése"
 
 msgid "Unselect all objects."
 msgstr "Minden objektum kijelölésének megszüntetése."
@@ -1680,14 +1677,16 @@ msgid "Update data"
 msgstr "Adatok frissítése"
 
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Az aktív adatréteg objektumainak frissítése a szerverről."
+msgstr "Az aktív adatréteg objektumainak frissítése a kiszolgálóról."
 
 msgid "Update modified"
 msgstr "Módosítások frissítése"
 
 msgid ""
 "Updates the currently modified objects from the server (re-downloads data)"
-msgstr "Frissíti a már módosított objektumokat a szerverről (újra letölti)"
+msgstr ""
+"Frissíti a már módosított objektumokat a kiszolgálóról (újra letölti az "
+"adatokat)"
 
 msgid "No current dataset found"
 msgstr "Nem található jelenlegi adathalmaz"
@@ -1696,26 +1695,26 @@ msgid "Did not find an object with id {0} in the current dataset"
 msgstr "Nem található egy {0} azonosítójú objektum az adathalmazban"
 
 msgid "Update selection"
-msgstr "Kijelölt frissítése"
+msgstr "Kijelölés frissítése"
 
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
-"A jelenleg kiválasztott objektumok frissítése a szerverről (adatok újra-"
-"letöltése)"
+"A jelenleg kijelölt objektumok frissítése a kiszolgálóról (újra letölti az "
+"adatokat)"
 
 msgid "There are no selected objects to update."
-msgstr "Nincsenek frissítésre kiválasztott objektumok."
+msgstr "Nincsenek frissítésre kijelölt objektumok."
 
 msgid "Selection empty"
-msgstr "Nincs kijelölés"
+msgstr "A kijelölés üres"
 
 msgid "Upload data"
 msgstr "Adatok feltöltése"
 
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
-"Az aktív adatréteg összes változtatásának feltöltése az OSM szerverre"
+"Az aktív adatréteg összes változtatásának feltöltése az OSM kiszolgálóra"
 
 msgid ""
 "<html>The data to be uploaded participates in unresolved conflicts of layer "
@@ -1748,19 +1747,20 @@ msgid "Nothing to upload. Get some data first."
 msgstr "Nincs mit feltölteni. Először szerezz néhány adatot."
 
 msgid "Upload note changes to server"
-msgstr "Jegyzet változások feltöltése a szerverre"
+msgstr "Jegyzet változtatások feltöltése a kiszolgálóra"
 
 msgid "Upload notes"
 msgstr "Jegyzetek feltöltése"
 
 msgid "Uploading notes to server"
-msgstr "Jegyzetek feltöltése a szerverre"
+msgstr "Jegyzetek feltöltése a kiszolgálóra"
 
 msgid "Upload selection"
-msgstr "Kijelölt feltöltése"
+msgstr "Kijelölés feltöltése"
 
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr "A kiválasztott elemek változtatásainak feltöltése az OSM szerverre."
+msgstr ""
+"A jelenlegi kijelölés összes változtatásának feltöltése az OSM kiszolgálóra."
 
 msgid "Checking parents for deleted objects"
 msgstr "Törölt objektumok szülőinek ellenőrzése"
@@ -1821,13 +1821,13 @@ msgid "Zoom to"
 msgstr "Ráközelítés"
 
 msgid "Zoom to the object the first selected member refers to"
-msgstr "Arra az objektumra közelítés, amire első kiválasztott tag hivatkozik"
+msgstr "Közelítés arra az objektumra, amelyre az első kijelölt tag hivatozk"
 
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Közelítés letiltva, mert a kapcsolat rétege nem aktív."
 
 msgid "Zooming disabled because there is no selected member"
-msgstr "Közelítés letiltva, mert nincs kiválasztott tag."
+msgstr "Közelítés letiltva, mert nincs kijelölt tag."
 
 msgid "Zoom to the first selected node"
 msgstr "Nagyítás az első kijelölt pontra"
@@ -1992,7 +1992,7 @@ msgid "No data found in this area."
 msgstr "Nem található adat ebben a tartományban."
 
 msgid "OSM Server URL:"
-msgstr "OSM szerver URL:"
+msgstr "OSM kiszolgáló URL:"
 
 msgid "Command"
 msgstr "Parancs"
@@ -2032,14 +2032,14 @@ msgid "Updating data"
 msgstr "Adatok frissítése"
 
 msgid "Check on the server"
-msgstr "Ellenőrzés a szerveren"
+msgstr "Ellenőrzés a kiszolgálón"
 
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"Kattints, hogy ellenőrizd, a helyi adathalmazodból melyik objektumokat "
-"törölték már a szerveren."
+"Kattints, hogy ellenőrizd, a helyi adathalmazodból mely objektumokat "
+"törölték már a kiszolgálón"
 
 msgid "Ignore"
 msgstr "Kihagy"
@@ -2324,8 +2324,8 @@ msgid ""
 "Select ways as in Select mode. Drag selected ways or a single way to create "
 "a parallel copy (Alt toggles tag preservation)"
 msgstr ""
-"Válassz vonalakt Kiválasztás módban. Mozgasd a kiválasztott vonalakat, vagy "
-"vonalat a párhuzamos másolat készítéséhez (Alt: címke megtartás kapcsoló)"
+"Jelölj ki vonalakat, mint a Kijelölés módban. Párhuzamos másolat "
+"készítéséhez mozgasd a kijelölt vonal(ak)at (Alt: címke megtartása kapcsoló)"
 
 msgid "Hold Ctrl to toggle snapping"
 msgstr "Az igazítás átkapcsolásához tartsd nyomva a Ctrl-t"
@@ -2334,8 +2334,8 @@ msgid ""
 "ParallelWayAction\n"
 "The ways selected must form a simple branchless path"
 msgstr ""
-"Párhuzamos készítési hiba\n"
-"A kiválasztott vonalaknak egy elágazás nélküli vonalat kell alkotniuk"
+"Hiba a párhuzamos vonal készítésénél\n"
+"A kijelölt vonalaknak egyszerű, elágazás nélküli vonalat kell alkotniuk"
 
 msgid "Drag play head"
 msgstr "Lejátszófej mozgatása"
@@ -2877,7 +2877,7 @@ msgid "Cannot parse timestamp ''{0}''"
 msgstr "„{0}” időbélyeg elemzése sikertelen"
 
 msgid "Expecting {0} after {1}"
-msgstr ""
+msgstr "{0} várt ez után: {1}"
 
 msgid "Range of primitive ids expected"
 msgstr "Elemazonosító tartományok szükségesek"
@@ -3402,29 +3402,29 @@ msgid ""
 "Failed to initialize preferences. Preference directory ''{0}'' is not a "
 "directory."
 msgstr ""
-"Nem sikerült a beállításokat inicializálni. A beállítások könyvtára \"{0}\" "
-"nem egy könyvtár."
+"Nem sikerült előkészíteni a beállításokat. A beállítások könyvtára „{0}” nem "
+"könyvtár."
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
 "not a directory.</html>"
 msgstr ""
-"<html>Nem sikerült inicializálni a beállításokat. A beállítás könyvtár "
-"''{0}'' nem könyvtár.</html>"
+"<html>Nem sikerült előkészíteni a beállításokat. A beállítások könyvtára "
+"„{0}” nem könyvtár.</html>"
 
 msgid ""
 "Failed to initialize preferences. Failed to create missing preference "
 "directory: {0}"
 msgstr ""
-"Nem sikerült inicializálni a beállításokat. A beállítások hiányzó könyvtára "
-"nem hozható létre: {0}"
+"Nem sikerült előkészíteni a beállításokat. Nem sikerült létrehozni a hiányzó "
+"beállítások könyvtárat: {0}"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to create missing "
 "preference directory: {0}</html>"
 msgstr ""
-"<html>Nem sikerült inicializálni a beállításokat. A beállítások hiányzó "
-"könyvtára nem hozható létre: {0}</html>"
+"<html>Nem sikerült előkészíteni a beállításokat. Nem sikerült létrehozni a "
+"hiányzó beállítások könyvtárat: {0}</html>"
 
 msgid "Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
@@ -3440,8 +3440,8 @@ msgid ""
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
 "to default: {0}</html>"
 msgstr ""
-"<html>A beállítások inicializálása nem sikerült.<br>Nem sikerült a beállítás "
-"fájlt az alapértelmezettre visszaállítani: {0}</html>"
+"<html>Nem sikerült előkészíteni a beállításokat.<br>Nem sikerült "
+"visszaállítani a beállítások fájlt az alapértékre: {0}</html>"
 
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to "
@@ -3455,8 +3455,8 @@ msgid ""
 "Failed to initialize preferences. Failed to reset preference file to "
 "default: {0}"
 msgstr ""
-"Nem sikerült a beállításokat inicializálni. Nem sikerült a beállítás fájlt "
-"visszaállítani az alapértelmezettre: {0}"
+"Nem sikerült előkészíteni a beállításokat. Nem sikerült visszaállítani a "
+"beállítások fájlt az alapértékre: {0}"
 
 msgid "Failed to load defaults cache file: {0}"
 msgstr ""
@@ -3974,7 +3974,7 @@ msgid ""
 "Error initializing test {0}:\n"
 " {1}"
 msgstr ""
-"{0} teszt inicializálása sikertelen:\n"
+"Hiba a(z) {0} teszt előkészítésekor:\n"
 " {1}"
 
 msgid "validation error"
@@ -4485,7 +4485,7 @@ msgid "Missing power tower/pole within power line"
 msgstr "Hiányzó oszlop/pózna a távvezetékben"
 
 msgid "Public Transport Route"
-msgstr "Tömegközlekedési útvonal"
+msgstr ""
 
 msgid "Route relation contains a ''{0}'' role"
 msgstr "Az útvonal kapcsolatnak „{0}” szerepű tagja van"
@@ -4772,7 +4772,7 @@ msgid "amenities type {0}"
 msgstr "szolgáltatás típus {0}"
 
 msgid "sport type {0}"
-msgstr "sport típus {0}"
+msgstr "sportág {0}"
 
 msgid "tourism type {0}"
 msgstr "turizmus típus {0}"
@@ -4968,7 +4968,7 @@ msgid "Offline mode"
 msgstr "Offline mód"
 
 msgid "Internal Server Error"
-msgstr "Belső szerverhiba"
+msgstr "Belső kiszolgálóhiba"
 
 msgid "Bad Request"
 msgstr "Hibás kérés"
@@ -5174,7 +5174,7 @@ msgid "Enabled detailed debug level (trace)"
 msgstr "Részletes hibakeresési szint (trace) engedélyezve"
 
 msgid "Initializing"
-msgstr "Inicializálás"
+msgstr "Előkészítés"
 
 msgid "Setting defaults"
 msgstr "Alapértelmezett beállítások"
@@ -5298,7 +5298,7 @@ msgstr "Adatok"
 
 msgctxt "menu"
 msgid "Selection"
-msgstr "Kiválasztás"
+msgstr "Kijelölés"
 
 msgctxt "menu"
 msgid "Presets"
@@ -5351,7 +5351,7 @@ msgstr "Kattintásra megnyílik a légifelvételek fül a beállításokból"
 
 msgctxt "menu"
 msgid "Audio"
-msgstr "Audio"
+msgstr "Hang"
 
 msgid "Do not hide toolbar"
 msgstr "Ne rejtse el az eszköztárat"
@@ -5656,14 +5656,14 @@ msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Elemek listája az én adathalmazomban (vagyis a helyiben)"
 
 msgid "Merged version"
-msgstr "Összevont változat"
+msgstr "Egyesített változat"
 
 msgid ""
 "List of merged elements. They will replace the list of my elements when the "
 "merge decisions are applied."
 msgstr ""
-"Összevont elemek listája. Ezek fogják lecserélni az én elemeimet, amikor az "
-"összevonás alkalmazva lesz."
+"Összevont elemek listája. Az egyesítési döntések alkalmazását követően ezek "
+"fognak az én elemeim listájának helyébe lépni."
 
 msgid "Their version"
 msgstr "Ő változata"
@@ -5675,13 +5675,13 @@ msgid "> top"
 msgstr "> teteje"
 
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "A kiválasztott pontjaim másolása az összevont lista elejére"
+msgstr "Kijelölt pontjaim másolása az összevont pontlista elejére"
 
 msgid "> bottom"
 msgstr "> alja"
 
 msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr "A kiválasztott pontjaim másolása az összevont lista végére"
+msgstr "Kijelölt elemeim másolása az összevont elemek listájának végére"
 
 msgid "> before"
 msgstr "> előtt"
@@ -5690,8 +5690,8 @@ msgid ""
 "Copy my selected elements before the first selected element in the list of "
 "merged elements."
 msgstr ""
-"A kiválasztott pontjaim másolása az összevont lista első kiválasztott eleme "
-"elé"
+"Kijelölt elemeim másolása az összevont elemek listájának első kijelölt eleme "
+"elé."
 
 msgid "> after"
 msgstr "> után"
@@ -5700,22 +5700,22 @@ msgid ""
 "Copy my selected elements after the first selected element in the list of "
 "merged elements."
 msgstr ""
-"A kiválasztott pontjaim másolása az összevont lista első kiválasztott eleme "
-"után"
+"Kijelölt elemeim másolása az összevont elemek listájának első kijelölt eleme "
+"mögé."
 
 msgid "< top"
 msgstr "< fent"
 
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
-msgstr "Az ő kiválasztott pontjainak másolása az összevont lista elejére"
+msgstr "Kijelölt elemeik másolása az összevont elemek listájának elejére."
 
 msgid "< bottom"
 msgstr "< lent"
 
 msgid ""
 "Copy their selected elements to the end of the list of merged elements."
-msgstr "Az ő kiválasztott pontjainak másolása az összevont lista végére"
+msgstr "Kijelölt elemeik másolása az összevont elemek listájának végére."
 
 msgid "< before"
 msgstr "< előtt"
@@ -5724,8 +5724,8 @@ msgid ""
 "Copy their selected elements before the first selected element in the list "
 "of merged elements."
 msgstr ""
-"Az ő kiválasztott pontjainak másolása az összevont lista  első kiválasztott "
-"eleme elé"
+"Kijelölt elemeik másolása az összevont elemek listájának első kijelölt eleme "
+"elé."
 
 msgid "< after"
 msgstr "< után"
@@ -5734,8 +5734,8 @@ msgid ""
 "Copy their selected element after the first selected element in the list of "
 "merged elements"
 msgstr ""
-"Az ő kiválasztott pontjainak másolása az összevont lista  első kiválasztott "
-"eleme után"
+"Kijelölt elemük másolása az összevont elemek listájának első kijelölt eleme "
+"mögé."
 
 msgid "Copy all my elements to the target"
 msgstr "Összes elemem másolás a célba"
@@ -5759,19 +5759,19 @@ msgid "Remove"
 msgstr "Eltávolítás"
 
 msgid "Remove the selected entries from the list of merged elements."
-msgstr "A kiválasztott elemek eltávolítása az összevont listából."
+msgstr "A kijelölt bejegyzések eltávolítása az összevont elemek listájából."
 
 msgid "Freeze"
 msgstr "Rögzítés"
 
 msgid "Freeze the current list of merged elements."
-msgstr "Az összevont elemek pillanatnyi listájának rögzítése."
+msgstr "Az összevont elemek jelenlegi listájának rögzítése."
 
 msgid "Unfreeze"
 msgstr "Feloldás"
 
 msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Az összevont lista elemeinek feloldása és az összevonás megkezdése"
+msgstr "Az összevont elemek listájának feloldása és az összevonás megkezdése"
 
 msgid ""
 "<html>Click <strong>{0}</strong> to start merging my and their "
@@ -5794,22 +5794,41 @@ msgstr[1] "Én változatom ({0} bejegyzés)"
 
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Összefésült változat ({0} bejegyzés)"
-msgstr[1] "Összefésült változat ({0} bejegyzés)"
+msgstr[0] "Összevont változat ({0} bejegyzés)"
+msgstr[1] "Összevont változat ({0} bejegyzés)"
 
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "Ő változata ({0} bejegyzés)"
 msgstr[1] "Ő változata ({0} bejegyzés)"
 
+msgid "My version (local dataset)"
+msgstr "Én változatom (helyi adathalmaz)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Tulajdonságok az én adathalmazomban, vagyis a helyiben"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Tulajdonságok az összevont elemben. Az összevonási döntés alkalmazását "
+"követően ezek fognak a saját elemeimben a tulajdonságok helyébe lépni."
+
+msgid "Their version (server dataset)"
+msgstr "Ő változata (szerver adathalmaz)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Tulajdonságok az ő adathalmazában, vagyis a szerveren"
+
 msgid "My with Their"
 msgstr "Enyém az Övével"
 
 msgid "My with Merged"
-msgstr "Enyém az egybevonttal"
+msgstr "Saját az összevonttal"
 
 msgid "Their with Merged"
-msgstr "Övé az egybevonttal"
+msgstr "Övék az összevonttal"
 
 msgid "Role {0} is not participating in compare pair {1}."
 msgstr "{0} szerep nem vesz részt az összehasonlítási párban {1}."
@@ -5845,8 +5864,8 @@ msgstr "Pontok (megoldva)"
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
-"Összevonandó pontlista fagyasztva. Nincsenek ütközések függőben a vonal "
-"pontlistájában"
+"Összevont pontlista rögzítve. A vonal pontlistájában nincs függőben lévő "
+"ütközés."
 
 msgid "Nodes(with conflicts)"
 msgstr "Pontok (ütközéssel)"
@@ -5861,8 +5880,8 @@ msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
 "relation"
 msgstr ""
-"Összevonandó taglista fagyasztva. Nincsenek ütközések függőben a kapcsolat "
-"taglistájában"
+"Összevont taglista rögzítve. A kapcsolat taglistájában nincsenek függőben "
+"lévő ütközések."
 
 msgid "Members(with conflicts)"
 msgstr "Tagok (ütközéssel)"
@@ -5887,30 +5906,8 @@ msgstr "Pont"
 
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
-"Az összefésült pontok még nincsenek rögzítve. Nem adhatsz ki megoldás "
-"parancsot."
-
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Tulajdonságok az én adathalmazomban, vagyis a helyiben"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Tulajdonságok az összefésült elemekben. Ezek fogják leváltani az én elemeim "
-"tulajdonságait az összefésülés alkalmazásakor."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Tulajdonságok az ő adathalmazában, vagyis a szerveren"
-
-msgid "Coordinates:"
-msgstr "Koordináták:"
-
-msgid "Deleted State:"
-msgstr "Törölt állapot:"
-
-msgid "Referenced by:"
-msgstr "Hivatkozva:"
+"Az összevont pontok még nincsenek rögzítve. Nem állíthatsz össze "
+"megoldásparancsnot."
 
 msgid "(none)"
 msgstr "(nincs)"
@@ -5921,6 +5918,15 @@ msgstr "törölve"
 msgid "not deleted"
 msgstr "nem törölt"
 
+msgid "Deleted State:"
+msgstr "Törölt állapot:"
+
+msgid "Coordinates:"
+msgstr "Koordináták:"
+
+msgid "Referenced by:"
+msgstr "Hivatkozva:"
+
 msgid "Keep my coordinates"
 msgstr "Koordinátáim megtartása"
 
@@ -5947,20 +5953,20 @@ msgstr "Elem"
 
 msgid "Merged members not frozen yet. Cannot build resolution command"
 msgstr ""
-"Az egyesített tagok még nincsenek fagyasztva. Nem lehet futtatni a megoldás "
-"műveletet"
+"Az összevont tagok még nincsenek rögzítve. Nem állíthatsz össze "
+"megoldásparancsnot."
 
 msgid "<undefined>"
 msgstr "<nincs megadva>"
 
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr "Az adathalmaza nem fogja tartalmazni a(z) {0} kulcsú címkét"
+msgstr "Az összevont adathalmaz nem fog {0} kulcsú címkét tartalmazni"
 
 msgid "My dataset does not include a tag with key {0}"
 msgstr "Az adathalmazom nem fogja tartalmazni {0} kulcsú címkét"
 
 msgid "Cannot apply undecided tag merge item."
-msgstr "Eldöntetlen cimke összefésülés elem nem alkalmazható."
+msgstr "Eldöntetlen címkeösszevonás-elem nem alkalmazható."
 
 msgid "Key"
 msgstr "Kulcs"
@@ -5968,12 +5974,6 @@ msgstr "Kulcs"
 msgid "Value"
 msgstr "Érték"
 
-msgid "My version (local dataset)"
-msgstr "Én változatom (helyi adathalmaz)"
-
-msgid "Their version (server dataset)"
-msgstr "Ő változata (szerver adathalmaz)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Kiválasztott kulcs/érték pár megtartása a helyi adathalmazból"
 
@@ -6211,12 +6211,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>Az egyesített pontok egy vagy több kapcsolat tagjai. Döntsd el, hogy "
-"szeretnéd <strong>megtartani</strong> ezeket a tagságokat a létrejött "
-"ponton, vagy szeretnéd <strong>törölni</strong> azokat.<br>Az alap "
-"beállítás, hogy <strong>megtartod</strong> az első pontot és "
-"<strong>törlöd</strong> a többi pontot, amik ugyan annak a kapcsolatnak a "
-"tagjai: Az egyesített pont átveszi a helyét az eredetieknek.</html>"
+"<html>Az egyesített pontok egy vagy több kapcsolat tagjai. Döntsd el, hogy a "
+"cél-pontok esetében ezeket a tagságokat szeretnéd-e "
+"<strong>megtartani</strong> vagy <strong>törölni</strong>.<br>Az "
+"alapbeállítás az, hogy egy kapcsolat tagjai közül az első pont "
+"<strong>megmarad</strong>, a többi pedig <strong>törlődik</strong>. A "
+"kapcsolatban a cél-pont átveszi az eredeti pont helyét.</html>"
 
 msgid "Apply this role to all members"
 msgstr "A szerep alkalmazása az összes tagra"
@@ -6588,7 +6588,7 @@ msgid "Relation: "
 msgstr "Kapcsolat: "
 
 msgid "deleted-on-server"
-msgstr "törölve-a-szerveren"
+msgstr "törölve-a-kiszolgálón"
 
 msgid "modified"
 msgstr "módosított"
@@ -7872,13 +7872,13 @@ msgid "Copy the value of the selected tag to clipboard"
 msgstr "A kijelölt címke értékének másolása vágólapra"
 
 msgid "Copy selected Key(s)/Value(s)"
-msgstr "kiválasztott kulcs(ok)/érték(ek) másolása"
+msgstr "Kijelölt kulcsok/értékek másolása"
 
 msgid "Copy the key and value of the selected tag(s) to clipboard"
 msgstr "A kiválasztott címk(ék) kulcs-érték párjának másolása a vágólapra"
 
 msgid "Copy all Keys/Values"
-msgstr "Összes Kulcs/Érték másolása"
+msgstr "Összes kulcs/érték másolása"
 
 msgid "Copy the key and value of all the tags to clipboard"
 msgstr "Az összes címke kulcs-érték párjának másolása vágólapra"
@@ -8495,13 +8495,13 @@ msgid "min lat"
 msgstr "min. szél."
 
 msgid "min lon"
-msgstr "min. hosz."
+msgstr "min. hossz."
 
 msgid "max lat"
 msgstr "max. szél."
 
 msgid "max lon"
-msgstr "max. hosz."
+msgstr "max. hossz."
 
 msgid "Clear textarea"
 msgstr "Szövegmező törlése"
@@ -8783,7 +8783,7 @@ msgstr "Előzmények újratöltése a szerverről"
 
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
-"Az előzmények még nincsenek inicializálva. Nem sikerült referenciaelemet "
+"Az előzmények még nincsenek előkészítve. Nem sikerült referenciaelemet "
 "beállítani."
 
 msgid ""
@@ -8800,7 +8800,7 @@ msgstr ""
 
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
-"Az előzmények még nincsenek inicializálva. Nem sikerült aktuális elemet "
+"Az előzmények még nincsenek előkészítve. Nem sikerült aktuális elemet "
 "beállítani."
 
 msgid ""
@@ -9841,19 +9841,19 @@ msgstr[0] "{0} törlendő objektum:"
 msgstr[1] "{0} törlendő objektum:"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Natív vetítések"
 
 msgid "Offset"
 msgstr "Eltolás"
 
 msgid "Tile download projection"
-msgstr ""
+msgstr "Csempeletöltési vetítés"
 
 msgid "Tile display projection"
-msgstr ""
+msgstr "Csempemegjelenítési vetítés"
 
 msgid "Current zoom"
-msgstr ""
+msgstr "Jelenlegi nagyítás"
 
 msgid "Show tile info"
 msgstr "Csempe infó megjelenítése"
@@ -9862,22 +9862,22 @@ msgid "Tile Info"
 msgstr "Csempe infó"
 
 msgid "Tile name"
-msgstr ""
+msgstr "Csempenév"
 
 msgid "Tile URL"
-msgstr ""
+msgstr "Csempe URL"
 
 msgid "Tile size"
-msgstr ""
+msgstr "Csempeméret"
 
 msgid "Tile display size"
-msgstr ""
+msgstr "Csempe megjelenített mérete"
 
 msgid "Reprojection"
-msgstr ""
+msgstr "Újravetítés"
 
 msgid "Reprojected tile size"
-msgstr ""
+msgstr "Újravetített csempeméret"
 
 msgid "Metadata "
 msgstr "Metaadatok "
@@ -10005,10 +10005,10 @@ msgid "Id"
 msgstr "ID"
 
 msgid "Min. zoom"
-msgstr ""
+msgstr "Legkisebb nagyítás"
 
 msgid "Max. zoom"
-msgstr ""
+msgstr "Legnagyobb nagyítás"
 
 msgid "Unsupported imagery type: {0}"
 msgstr "Nem támogatott légifelvétel típus: {0}"
@@ -10595,7 +10595,7 @@ msgid "Wave Audio files (*.wav)"
 msgstr "Wave audio fájlok (*.wav)"
 
 msgid "Import Audio"
-msgstr "Audio importálása"
+msgstr "Hang importálása"
 
 msgid ""
 "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
@@ -10613,8 +10613,7 @@ msgid "Audio markers from {0}"
 msgstr "Hangjelölők innen: {0}"
 
 msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Nem érhető el az audiofelvételhez társítható GPX nyomvonal a rétegen."
+msgstr "Nem érhető el a hangfelvételhez társítható GPX-nyomvonal a rétegen."
 
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10692,7 +10691,7 @@ msgstr[0] "{0} {1} jelölőből áll"
 msgstr[1] "{0} {1} jelölőből áll"
 
 msgid "No existing audio markers in this layer to offset from."
-msgstr "Nincsenek audio jelölők a rétegen az eltoláshoz."
+msgstr "Nincsenek hangjelölők a rétegen az eltoláshoz."
 
 msgid "Show Text/Icons"
 msgstr "Szöveg/ikonok megjelenítése"
@@ -10701,7 +10700,7 @@ msgid "Toggle visible state of the marker text and icons."
 msgstr "A jelölő szövegének és ikonjának láthatóságát váltja."
 
 msgid "Synchronize Audio"
-msgstr "Audio szinkronizálása"
+msgstr "Hang szinkronizálása"
 
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10710,20 +10709,20 @@ msgstr ""
 "utasításodat."
 
 msgid "Audio synchronized at point {0}."
-msgstr "Audio szinkronizálva ennél a pontnál: {0}."
+msgstr "Hang szinkronizálva ennél a pontnál: {0}."
 
 msgid "Unable to synchronize in layer being played."
 msgstr "Nem lehet szinkronizálni a lejátszott rétegen."
 
 msgid "Make Audio Marker at Play Head"
-msgstr "Audio Jelölő készítése a lejátszófejnél"
+msgstr "Hangjelölő készítése a lejátszófejnél"
 
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-"Szüneteltetned kell az audio lejátszását a nyomvonal azon pontjánál, ahova "
-"jelölőt szeretnél rakni."
+"Szüneteltetned kell az hang lejátszását a nyomvonal azon pontjánál, ahova "
+"jelölőt szeretnél tenni."
 
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -10740,7 +10739,7 @@ msgstr ""
 "útpontra, ahova szinkronizálni szeretnél."
 
 msgid "Unable to create new audio marker."
-msgstr "Nem lehet új audio jelzőt készíteni."
+msgstr "Nem lehet új hangjelölőt létrehozni."
 
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Hiba történt, a jelölő URL-ének megjelenítése közben"
@@ -11043,9 +11042,6 @@ msgstr "Bezárja az ablakot az azonosítás megszakításával"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Bezárja az ablakot az Elérési Token elfogadásával"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Nem sikerült megszakítani az OAuth műveletet"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Az OAuth Kérelmi Token fogadása innen: \"{0}\""
 
@@ -11593,19 +11589,19 @@ msgid "Value: "
 msgstr "Érték: "
 
 msgid "Audio Settings"
-msgstr "Audió beállítások"
+msgstr "Hangbeállítások"
 
 msgid "Settings for the audio player and audio markers."
-msgstr "Hanglejátszó és hangjelzők beállításai."
+msgstr "Hanglejátszó és hangjelölők beállításai."
 
 msgid "Display the Audio menu."
-msgstr "Audio menü megjelenítése"
+msgstr "A Hang menü megjelenítése"
 
 msgid "Label audio (and image and web) markers."
-msgstr "Hang (kép- és web) jelölők cimkézése."
+msgstr "Hang- (és kép- és web-) jelölők cimkézése."
 
 msgid "Display live audio trace."
-msgstr "Élő audio nyomvonal megjelenítése."
+msgstr "Élő hangnyomvonal megjelenítése."
 
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explicit útpontok érvényes időbélyeggel."
@@ -11617,14 +11613,14 @@ msgid "Named trackpoints."
 msgstr "Elnevezett útpontok."
 
 msgid "Modified times (time stamps) of audio files."
-msgstr "Hangfájlok idő (időbéllyegek) módosításai."
+msgstr "Hangfájlok módosított idői (időbélyegei)."
 
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 "Nyomvonal eleje (mindig ezt fogja csinálni, ha nincs elérhető jelölő)"
 
 msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Megjeleníti vagy elrejti az audio menüelemet a felső menüsorról."
+msgstr "A Hang menüelem megjelenítése vagy elrejtése a főmenüben."
 
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11637,28 +11633,28 @@ msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
 msgstr ""
-"Szövegcímkék elhelyezése a hang (kép- és web) jelölőkkel szemben, az "
-"ikonjaikkal egyetemben."
+"Szövegcímkék és ikongombjaik elhelyezése a hang- (és kép- és web.) "
+"jelölőkkel szemben."
 
 msgid "When importing audio, make markers from..."
-msgstr "Audio importálásakor készíts jelölőket innen..."
+msgstr "Hang importálásakor jelölők készítése innen…"
 
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Audio importálásakor alkalmazd a GPX réteg minden útpontjára."
+msgstr "Hang importálásakor alkalmazd a GPX-réteg minden útpontjára."
 
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
 msgstr ""
-"Automatikus hang jelölők generálása a nyomkövetési pontokból (inkább mint "
+"Hangjelölők automatikus létrehozása a nyomkövetési pontokból (inkább mint a "
 "kifejezett útpontokból) nevekkel vagy leírásokkal."
 
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
 msgstr ""
-"Hang jelölők készítése minden egyes beolvasott WAV fájl módosítási ideje "
-"alapján, a nyomvonal adott időpontjában található pozícióhoz."
+"Hangjelölők létrehozása a nyomvonal azon pozíciójánál, amely megfelel az "
+"egyes importált WAV-hangfájlok módosított idejének."
 
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -12084,7 +12080,7 @@ msgid "Waypoint labelling"
 msgstr "Útpontcímkézés"
 
 msgid "Audio waypoint labelling"
-msgstr "Audioútpontok címkézése"
+msgstr "Hangos útpontok címkézése"
 
 msgid "Incorrect waypoint label pattern: {0}"
 msgstr "Hibás útpontcímke minta: {0}"
@@ -12093,7 +12089,7 @@ msgid "Incorrect pattern"
 msgstr "Hibás minta"
 
 msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr "Hibás audioútpont minta: {0}"
+msgstr "Hibás mintázat a hangos útpont címkéjénél: {0}"
 
 msgid "Show splash screen at startup"
 msgstr "Nyitóképernyő megjelenítése indításkor"
@@ -12369,10 +12365,10 @@ msgid "Autoload tiles by default: "
 msgstr "Alapértelmezett automatikus csempeletöltés: "
 
 msgid "Min. zoom level: "
-msgstr "Min. zoom szint: "
+msgstr "Legkisebb nagyítás szintje: "
 
 msgid "Max. zoom level: "
-msgstr "Max. zoom szint: "
+msgstr "Legnagyobb nagyítás szintje: "
 
 msgid "Add to slippymap chooser: "
 msgstr "Hozzáadás a slippymap választóba: "
@@ -12900,8 +12896,8 @@ msgstr "PUWG zóna"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Svájci rács (Svjác)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (helyi korrekció nélkül)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13604,7 +13600,7 @@ msgid "Unknown requisite: {0}"
 msgstr "Ismeretlen követelmény: {0}"
 
 msgid "Unknown regexp value: {0}"
-msgstr ""
+msgstr "Ismeretlen reguláris kifejezés érték: {0}"
 
 msgid "Illegal member expression: {0}"
 msgstr "Helytelen tagi kifejezés: {0}"
@@ -13651,16 +13647,16 @@ msgid "Received error page:"
 msgstr "Visszakapott hibaoldal:"
 
 msgid "Min. latitude"
-msgstr "Min. szélesség"
+msgstr "Legkisebb szélesség"
 
 msgid "Min. longitude"
-msgstr "Min. hosszúság"
+msgstr "Legkisebb hosszúság"
 
 msgid "Max. latitude"
-msgstr "Max. szélesség"
+msgstr "Legnagyobb szélesség"
 
 msgid "Max. longitude"
-msgstr "Max. hosszúság"
+msgstr "Legnagyobb hosszúság"
 
 msgid ""
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
@@ -14130,7 +14126,7 @@ msgstr ""
 "módban)"
 
 msgid "Unable to initialize OSM API."
-msgstr "Az OSM API inicializálása nem lehetséges."
+msgstr "Az OSM API előkészítése nem lehetséges."
 
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr "A JOSM ezen verziója nem kompatibilis a bekonfigurált szerverrel."
@@ -14323,10 +14319,13 @@ msgstr "A beolvasás meg lett szakítva"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"A ''bounds'' elemnek vannak hiányzó, de kötelező jellemzői. Kapott: "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "A törölt {0} vonal tartalmaz pontokat"
@@ -15240,9 +15239,9 @@ msgid ""
 "<html>Failed to initialize communication with the OSM server {0}.<br>Check "
 "the server URL in your preferences and your internet connection."
 msgstr ""
-"<html>A(z) {0} OSM szerverrel való kommunikáció inicializálása "
-"meghiúsult.<br>Ellenőrizd a szerver URL-t a beállításokban és az internet "
-"kapcsolatot."
+"<html>A(z) {0} OSM kiszolgálóval való kommunikáció előkészítése "
+"meghiúsult.<br>Ellenőrizd a kiszolgáló URL-t a beállításokban és az "
+"internetkapcsolatot."
 
 msgid ""
 "<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
@@ -15669,9 +15668,6 @@ msgstr "URL megnyitása: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "Az URL nem tartalmaz {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "fenntartott"
-
 msgid "Outdated Java version"
 msgstr "Elavult JAVA verzió"
 
@@ -15681,9 +15677,6 @@ msgstr "Java frissítés"
 msgid "You are running version {0} of Java."
 msgstr "A(z) {0} verziójú Java-t futtatod."
 
-msgid "April 2015"
-msgstr "2015 április"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15698,9 +15691,17 @@ msgstr ""
 "Hamarosan a JOSM már nem fog működni ezzel a verzióval; erősen javasolt "
 "frissítened a {0} Java verzióra."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Szeretnél most frissíteni?"
 
+msgid "reserved"
+msgstr "fenntartott"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16036,7 +16037,7 @@ msgstr ""
 
 msgctxt "landuse"
 msgid "cemetery"
-msgstr ""
+msgstr "temető"
 
 msgctxt "landuse"
 msgid "residential"
@@ -16044,7 +16045,7 @@ msgstr "lakóterület"
 
 msgctxt "landuse"
 msgid "greenfield"
-msgstr ""
+msgstr "zöldmezős terület"
 
 msgctxt "landuse"
 msgid "village_green"
@@ -16088,11 +16089,11 @@ msgstr ""
 
 msgctxt "leisure"
 msgid "park"
-msgstr ""
+msgstr "park"
 
 msgctxt "leisure"
 msgid "track"
-msgstr ""
+msgstr "földút"
 
 msgctxt "building"
 msgid "industrial"
@@ -16339,6 +16340,12 @@ msgstr "HDM (Humanitárius OpenStreetMap Csapat)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox műholdkép"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16366,6 +16373,9 @@ msgstr "OpenStreetMap (Német stílusú)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Nyomvonalak"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Tömegközlekedés (ÖPNV)"
 
@@ -16396,6 +16406,9 @@ msgstr "Strava kerékpáros és futó hőtérkép"
 msgid "Locator Overlay"
 msgstr "Kereső rátét"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA nincs cím"
 
@@ -16415,7 +16428,7 @@ msgid "Waymarked Trails: Horse Riding"
 msgstr "Waymarked Trails: lovaglás"
 
 msgid "Waymarked Trails: Winter Sports"
-msgstr "Waymarked Trails: téli sportok"
+msgstr "Vonalpontos útvonalak: téli sportok"
 
 msgid "OSM Inspector: Geometry"
 msgstr "OSM Inspector: geometria"
@@ -16444,21 +16457,32 @@ msgstr "OSM Inspector: Partvonal (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de OSM képek térképezéshez: Prokletije-hegység (Albán Alpok)"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de OSM képek térképezéshez: Dél-Transzantarktiszi-hegység"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM képek térképezéshez: Pensacola-hegység"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "imagico.de OSM képek térképezéshez: Elefánt-sziget/Clarence-sziget"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16500,15 +16524,30 @@ msgstr "LPI NSW közigazgatási határ NPWS rezervátum"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de OSM képek térképezéshez: Északnyugat-Heard-sziget"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM képek térképezéshez: Heard-sziget part"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at ortofotó"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16524,6 +16563,12 @@ msgstr "Tiris: DOM (Felületi model)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: szintvonalak"
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (általános célú)"
 
@@ -16629,9 +16674,15 @@ msgstr "Benin: Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM képek térképezéshez: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM képek térképezéshez: Bouvet-sziget"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16641,6 +16692,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16725,9 +16779,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hidrológiai"
 
@@ -16743,31 +16824,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Legfrissebb délnyugat Brit Columbia Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna utak rátét"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de OSM képek térképezéshez: Keleti-Devon-sziget partvonal"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM képek térképezéshez: Északi-Ellesmere-sziget"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr "imagico.de OSM képek térképezéshez: Északi-Ellesmere-sziget 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM képek térképezéshez: Fogo, Cape Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM képek térképezéshez: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM képek térképezéshez: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -16786,14 +16896,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -16801,22 +16911,32 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM képek térképezéshez: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Darwin- és Wolf-szigetek, Galapagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Alaptérkép (Maaamet)"
 
@@ -16835,6 +16955,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16847,6 +16970,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "RAIG - Auvergne 2013 - 25 cm"
 
@@ -16977,18 +17103,23 @@ msgstr ""
 "imagico.de OSM képek térképezéshez: Észak-német nyugati parti árapálysíkságok"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Észak-német nyugati parti "
 "árapálysíkságok (infravörös)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17021,9 +17152,15 @@ msgstr "München legfrissebb légifotó 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM képek térképezéshez: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM képek térképezéshez: Thule légibázis"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17032,6 +17169,10 @@ msgstr ""
 "átrepülés 2015 szeptember"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17047,16 +17188,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM képek térképezéshez: Grönland mozaik"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de OSM képek térképezéshez: 2013 május ferdetengelyű Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Landsat, ferdetengelyű, 2016 július"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM képek térképezéshez: Észak-Grönland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drón ábrázolás (Haiti)"
 
@@ -17097,13 +17254,13 @@ msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
 msgstr "Dunapart budapesti, szentendrei és szigetmonostori szakasza"
 
 msgid "Budapest district XI orthophoto 2015"
-msgstr ""
+msgstr "Budapest XI. kerület ortofotó 2015"
 
 msgid "Budapest district XI orthophoto 2017"
-msgstr ""
+msgstr "Budapest XI. kerület ortofotó 2017"
 
 msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
-msgstr ""
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd ortofotó 2017"
 
 msgid "5 cm resolution bald image of 4 settlement"
 msgstr ""
@@ -17117,18 +17274,37 @@ msgstr "Domborzatárnyékolás, Magyarország"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM képek térképezéshez: Kelet-Izland"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM képek térképezéshez: Rann of Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM képek térképezéshez: Délkeleti-Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM képek térképezéshez:  Bakun-víztározó"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM képek térképezéshez: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17192,18 +17368,29 @@ msgstr "Dél-Tirol ortofotó 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Dél-Tirol ortofotó 2011 (nagyfelbontású)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Dél-Tirol ortofotó 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Dél-Tirol topográfiai térkép"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japán GSI ortofotó"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de OSM képek térképezéshez: Mount Kenya 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -17237,26 +17424,35 @@ msgstr "Luxembourg Inspire vizek"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK légifotó Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK légifotó Beeldmateriaal 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -ortofotó 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de OSM képek térképezéshez: Nyugat-Karakorum"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17267,15 +17463,29 @@ msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Panama-csatorna - csendes-óceáni oldal"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM képek térképezéshez: Panama-csatorna"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM képek térképezéshez: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM képek térképezéshez: New Ireland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de OSM képek térképezéshez: Coropuna"
 
@@ -17284,6 +17494,9 @@ msgid ""
 msgstr ""
 "imagico.de OSM képek térképezéshez: Willkanuta-hegység és Quelccaya-jégsapka"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17422,24 +17635,36 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de OSM képek térképezéshez: Kerch-szoros"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "imagico.de OSM képek térképezéshez: Usakov-sziget 2016 augusztus"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Északi- és Sarki-Urál 2016 augusztus"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "imagico.de OSM képek térképezéshez: Vostochny Cosmodrome"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr ""
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17466,18 +17691,34 @@ msgstr "RABA-KGZ: Szlovénia beépített területek"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Cape Town városa 2013 légifelvétel"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "City of Cape Town 2015 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM képek térképezéshez: Leskov-sziget ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM képek térképezéshez: Scott-sziget"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM képek térképezéshez: Leskov-sziget Landsat"
 
@@ -17511,6 +17752,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de OSM képek térképezéshez: Adams-híd"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17590,12 +17834,20 @@ msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 "imagico.de OSM képek térképezéshez: Középső-Alpok 2016 késő szeptember"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (szintvonallal)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan településhatár"
 
@@ -17651,8 +17903,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM képek térképezéshez: Alaszka"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17727,9 +17979,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 orotfotó"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM képek térképezéshez: Rwenzori-hegység"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "imagico.de OSM képek térképezéshez: Rwenzori-hegység 2016"
 
@@ -17781,240 +18044,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS várostervek, Edinburgh 1940s-1960s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Várostervek, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "Angol (OS) városrendezési tervek, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -18119,7 +18757,7 @@ msgid "Create a grid of ways."
 msgstr "Vonalak hálózatát hozza létre."
 
 msgid "Customization of public public transport stops."
-msgstr ""
+msgstr "Az összes tömegközlekedési megálló testreszabása"
 
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -18529,9 +19167,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 ""
-"Területeket egyszerűsít azáltal, hogy a nagyon tompa szögekben lévő pontokat "
-"távolít el. Ez korlátozható a maximálisan eltávolítandó terület méretével. A "
-"közeli pontokat is átlagolja."
+"Terület egyszerűsítés a nagyon tompa szögeknél lévő pontok eltávolításával. "
+"Korlátozható a legnagyobb eltávolított területtel. A közeli pontokat is "
+"átlagolja."
 
 msgid "Edit features for OpenSeaMap"
 msgstr "OpenSeaMap tulajdonságok szerkesztése"
@@ -18652,7 +19290,8 @@ msgstr ""
 "hibákat tartalmazhat."
 
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr "Letöltés egyszerűen, egy csatlakozó vonalsorozat mentén."
+msgstr ""
+"Egyszerű letöltés egy hosszú, egymáshoz csatlakozó vonalsorozat mentén"
 
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Lehetővé teszi GPX fájlból betöltött útpontok keresését."
@@ -18820,13 +19459,13 @@ msgid "Lanes opposed to way direction"
 msgstr "Sávok a vonallal ellentétes irányban"
 
 msgid "Max. speed (km/h)"
-msgstr "Megengedett sebesség (km/h)"
+msgstr "Sebességkorlátozás (km/h)"
 
 msgid "Max. speed in way direction"
-msgstr "Max. sebesség a vonal irányában"
+msgstr "Sebességkorlátozás a vonal irányában"
 
 msgid "Max. speed opposed to way direction"
-msgstr "Max. sebesség a vonallal ellentétes irányban"
+msgstr "Sebességkorlátozás a vonallal ellentétes irányban"
 
 msgid "Bridge"
 msgstr "Híd"
@@ -19108,10 +19747,10 @@ msgid "Height (meters)"
 msgstr "Magasság (méter)"
 
 msgid "Max. width (meters)"
-msgstr "Max. szélesség (méter)"
+msgstr "Szélességkorlátozás (méter)"
 
 msgid "Max. height (meters)"
-msgstr "Max. magasság (méter)"
+msgstr "Magasságkorlátozás (méter)"
 
 msgid "pitch"
 msgstr "sportpálya"
@@ -19271,7 +19910,7 @@ msgstr "futás"
 
 msgctxt "sport"
 msgid "safety_training"
-msgstr ""
+msgstr "biztonsági képzés"
 
 msgctxt "sport"
 msgid "shooting"
@@ -19635,7 +20274,7 @@ msgid "vacuum"
 msgstr "vákum"
 
 msgid "Max. weight (tonnes)"
-msgstr "Max. össztömeg (tonna)"
+msgstr "Súlykorlátozás (tonna)"
 
 msgid "Toll"
 msgstr "Fizetős"
@@ -20031,7 +20670,7 @@ msgid "No exit (cul-de-sac)"
 msgstr "Zsákutca"
 
 msgid "Transport mode restrictions"
-msgstr "Közlekedési mód korlátozások"
+msgstr "Közlekedési mód korlátozásai"
 
 msgid "official"
 msgstr "hivatalos"
@@ -20073,16 +20712,16 @@ msgid "Tourist buses"
 msgstr "Túrista buszok"
 
 msgid "Max. speed Heavy Goods Vehicles (km/h)"
-msgstr "Max. sebesség tehergépjárműveknek (km/h)"
+msgstr "Sebeeségkorlátozás tehergépkocsinak (km/h)"
 
 msgid "Min. speed (km/h)"
-msgstr "Min. sebesség (km/h)"
+msgstr "Kötelező legkisebb sebesség (km/h)"
 
 msgid "Max. axleload (tonnes)"
-msgstr "Max. tengelyterhelés (tonna)"
+msgstr "Tengelyterhelés-korlátozás (tonna)"
 
 msgid "Max. length (meters)"
-msgstr "Max. hosszúság (méter)"
+msgstr "Hosszúságkorlátozás (méter)"
 
 msgid "Overtaking"
 msgstr "Előzés"
@@ -20216,8 +20855,8 @@ msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
 "jagged rocks, few dangerous glacier and snow"
 msgstr ""
-"szimpla, egyszerűen mászható egészen a második nehézségi fokozatig. "
-"Védtelen, megerőltető terep, recés sziklák, néhány veszélyes gleccser és hó"
+"szimpla, egyszerűen mászható egészen a második nehézségi fokozatig. Kitett, "
+"megerőltető terep, éles sziklák, néhány veszélyes gleccser és hó"
 
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr "T6 - veszélyes alpesi túraút mászással"
@@ -20226,8 +20865,8 @@ msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
 "glacier with danger to slip and fall"
 msgstr ""
-"mászható egészen a második nehézségi fokozatig. Gyakran teljesen védtelen, "
-"laza recés sziklák, gleccser csúszás és lezuhanás veszélyével"
+"mászható egészen a második nehézségi fokozatig. Gyakran nagyon kitett; "
+"ingatag, éles, sziklák, gleccser, csúszás- és lezuhanásveszélyes."
 
 msgid "Visibility"
 msgstr "Láthatóság"
@@ -20617,7 +21256,7 @@ msgid "Toll Booth"
 msgstr "Fizetőkapu"
 
 msgid "Border Control"
-msgstr "Határellenőrzés"
+msgstr "Határátkelő"
 
 msgid "Hedge"
 msgstr "Sövény"
@@ -20653,7 +21292,7 @@ msgid "wire"
 msgstr "sodrony"
 
 msgid "Guard Rail"
-msgstr "Szallagkorlát"
+msgstr "Szalagkorlát"
 
 msgid "Wall"
 msgstr "Fal"
@@ -20678,7 +21317,7 @@ msgid "Ditch"
 msgstr "Vizesárok"
 
 msgid "Kerb"
-msgstr "Szegély"
+msgstr "Járdaszegély"
 
 msgid "Tactile paving"
 msgstr "Taktilis burkolat"
@@ -20690,10 +21329,10 @@ msgid "Gate"
 msgstr "Kapu"
 
 msgid "Lift Gate"
-msgstr "Sorompó"
+msgstr "Emelkdeő sorompó"
 
 msgid "Swing Gate"
-msgstr "Oldalra nyíló sorompó"
+msgstr "Elforduló sorompó"
 
 msgctxt "swing_gate"
 msgid "single"
@@ -21674,7 +22313,7 @@ msgid "Tram stop (legacy)"
 msgstr "Villamosmegálló (örökség)"
 
 msgid "Train"
-msgstr "Vasúti szerelvény"
+msgstr "Vonat"
 
 msgid "Railway halt (legacy)"
 msgstr "Vasúti megálló (örökség)"
@@ -22001,7 +22640,7 @@ msgid "Riding"
 msgstr "Lovagló"
 
 msgid "... other transportation modes possible"
-msgstr "... egyéb közlekedési módok lehetségesek"
+msgstr "…egyéb közlekedési módok lehetségesek"
 
 msgid "Information Board"
 msgstr "Információs tábla"
@@ -22048,7 +22687,7 @@ msgid "Closer description"
 msgstr "Pontosabb leírás"
 
 msgid "Audio Guide"
-msgstr "Tárlatvezetés hangfelvétellel"
+msgstr "Audioguide (tárlatvezetés hangfelvétellel)"
 
 msgid "Information using headphones or a mobile phone."
 msgstr ""
@@ -22185,9 +22824,8 @@ msgstr "falfestmény"
 msgid "sculpture"
 msgstr "szobor"
 
-# Főleg fém vagy kő és nagyobb méretű általában, emlékmű jellegű központi elem.
 msgid "statue"
-msgstr "szobor (emlékmű)"
+msgstr "szobor"
 
 msgid "Artist Name"
 msgstr "Művész neve"
@@ -22245,7 +22883,7 @@ msgstr "katolikus"
 
 msgctxt "christian"
 msgid "evangelical"
-msgstr "evangélikus"
+msgstr "evangéliumi keresztény"
 
 msgctxt "christian"
 msgid "greek_catholic"
@@ -22261,7 +22899,7 @@ msgstr "jehova tanúi"
 
 msgctxt "christian"
 msgid "lutheran"
-msgstr "lutheránus"
+msgstr "evangélikus (lutheránus)"
 
 msgctxt "christian"
 msgid "methodist"
@@ -22901,7 +23539,7 @@ msgid "Billboard"
 msgstr "Hírdetőtábla"
 
 msgid "Sports"
-msgstr "Sportszer"
+msgstr "Sport"
 
 msgid "Sport Facilities"
 msgstr "Sportlétesítmények"
@@ -23598,7 +24236,7 @@ msgid "Crane"
 msgstr "Daru"
 
 msgid "Mineshaft"
-msgstr "Bányaakna"
+msgstr "Bányaakna (függőleges)"
 
 msgid "Function"
 msgstr "Funkció"
@@ -23673,7 +24311,7 @@ msgid "Disused"
 msgstr "Használíton kívül"
 
 msgid "Adit"
-msgstr "Tárna"
+msgstr "Bányatárna (vízszintes)"
 
 msgid "Length in meters"
 msgstr "Hossz méterben"
@@ -23702,7 +24340,7 @@ msgid "Water Works"
 msgstr "Vízmű"
 
 msgid "Wastewater Treatment Plant"
-msgstr "Víztisztító telep"
+msgstr "Szennyvíztisztító telep"
 
 msgid "Watermill"
 msgstr "Vízimalom"
@@ -23720,7 +24358,7 @@ msgid "Street Lamp"
 msgstr "Lámpaoszlop"
 
 msgid "Monitoring Station"
-msgstr "Mérőállomás"
+msgstr "Megfigyelőállomás"
 
 msgid "Monitoring:"
 msgstr "Felügyelet:"
@@ -24721,10 +25359,10 @@ msgid "Battlefield"
 msgstr "Csatamező"
 
 msgid "Palaeontological Site"
-msgstr "Őslénylelőhely"
+msgstr "Őslénytani lelőhely"
 
 msgid "Monument"
-msgstr "Műemlék"
+msgstr "Kiemelkedően jelentős emlékmű"
 
 msgid "Memorial"
 msgstr "Emlékmű"
@@ -24760,14 +25398,14 @@ msgid "Wayside Cross"
 msgstr "Útmenti kereszt"
 
 msgid "Wayside Shrine"
-msgstr "Síremlék"
+msgstr "Útmenti kegyhely"
 
 msgid "Place of worship"
 msgstr "Istentiszteleti hely"
 
 msgctxt "building"
 msgid "wayside_shrine"
-msgstr "síremlék"
+msgstr "Útmenti kegyhely"
 
 msgid "Boundary Stone"
 msgstr "Határkő"
@@ -24799,6 +25437,9 @@ msgstr "Halárus"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delikatesz bolt"
 
@@ -24989,7 +25630,7 @@ msgid "Hearing Aids"
 msgstr "Hallókészülék"
 
 msgid "Medical Supply"
-msgstr "Egészségügyi segédeszközök"
+msgstr "Gyógyászati segédeszközök boltja"
 
 msgid "Jewellery"
 msgstr "Ékszerész"
@@ -25013,7 +25654,7 @@ msgid "Do-It-Yourself Store"
 msgstr "Barkácsbolt"
 
 msgid "Hardware"
-msgstr "Háztartási bolt"
+msgstr "Vas-műszaki bolt"
 
 msgid "Paint"
 msgstr "Festékbolt"
@@ -25079,7 +25720,7 @@ msgid "drinks"
 msgstr "italok"
 
 msgid "elongated_coin"
-msgstr "emlékérme"
+msgstr "kinyújtott emlékérme"
 
 msgid "excrement_bags"
 msgstr "ürülékgyűjtő zacskó"
@@ -25443,7 +26084,7 @@ msgid "Title or type of protection"
 msgstr "A védelem címe vagy típusa"
 
 msgid "Border type"
-msgstr "Határ típus"
+msgstr "Határtípus"
 
 msgid "baseline"
 msgstr "alapvonal"
@@ -25925,10 +26566,10 @@ msgid "Construction Area"
 msgstr "Építési terület"
 
 msgid "Brownfield"
-msgstr "Bontási"
+msgstr "Barnamezős terület"
 
 msgid "Greenfield"
-msgstr "Zöldmezős beruházás"
+msgstr "Zöldmezős terület"
 
 msgid "Landfill"
 msgstr "Szemétlerakó"
@@ -26374,13 +27015,13 @@ msgid "check"
 msgstr "ellenőrzés"
 
 msgid "Max. height (meters, only if enforcement=maxheight)"
-msgstr "Max. magasság (méter, csak max magasság típusnál)"
+msgstr "Magasságkorlátozás (méter, csak ha enforcement=maxheight)"
 
 msgid "Max. weight (tonnes, only if enforcement=maxweight)"
-msgstr "Max. súly (tonna, csak max súly típusnál)"
+msgstr "Súlykorlátozás (tonna, csak ha enforcement=maxweight)"
 
 msgid "Max. speed (km/h, only if enforcement=maxspeed)"
-msgstr "Max. sebesség (km/h, csak max sebesség típusnál)"
+msgstr "Sebességkorlátozás  (km/h, csak ha enforcement=maxspeed)"
 
 msgid "location of enforcement device"
 msgstr "kényszerítő eszköz helye"
@@ -26674,7 +27315,7 @@ msgid "View %name% sheet of church"
 msgstr ""
 
 msgid "View Mérimée sheet of monument"
-msgstr ""
+msgstr "Emlékmű Mérimée-adatlapjának megtekintése (FR)"
 
 msgid "View Mérimée list for this municipality"
 msgstr ""
@@ -27098,7 +27739,7 @@ msgid "unusual {0} specification"
 msgstr "furcsa {0} meghatározás"
 
 msgid "unusual train track gauge; use mm with no separator"
-msgstr "szokatlan vonatsín nyomtávolság; használj mm-t elválasztó nélkül"
+msgstr "szokatlan vonatsín-nyomtáv; használj mm-t elválasztó nélkül"
 
 msgid "unusual incline; use percentages/degrees or up/down"
 msgstr ""
@@ -27113,6 +27754,9 @@ msgstr "{0} pozitív egész szám kell legyen"
 msgid "unusual value of {0}"
 msgstr "{0} értéke szokatlan"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "kapcsolat típus nélkül"
 
@@ -27120,16 +27764,16 @@ msgid "{0} relation without {0} tag"
 msgstr "{0} kapcsolat {0} cimke nélkül"
 
 msgid "religion without denomination"
-msgstr "vallás felekezet nélkül"
+msgstr "felekezet nélküli vallás"
 
 msgid "unknown christian denomination"
-msgstr "ismeretlen keresztény gyülekezet"
+msgstr "ismeretlen keresztény felekezet"
 
 msgid "unknown muslim denomination"
-msgstr "ismeretlen muszlim gyülekezet"
+msgstr "ismeretlen muszlim felekezet"
 
 msgid "unknown jewish denomination"
-msgstr "ismeretlen zsidó gyülekezet"
+msgstr "ismeretlen zsidó felekezet"
 
 msgid "street name contains ss"
 msgstr "az utcanév ss-t tartalmaz"
@@ -28113,6 +28757,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importálás"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28247,7 +28894,7 @@ msgstr[0] "{0} kép importálva"
 msgstr[1] "{0} kép importálva"
 
 msgid "2 images joined"
-msgstr "2 kép összekötve"
+msgstr "2 két összekapcsolva"
 
 msgid "Moved {0} image"
 msgid_plural "Moved {0} images"
@@ -28370,7 +29017,7 @@ msgid "Recommend categories to your newly created instances."
 msgstr ""
 
 msgid "Training process configuration"
-msgstr ""
+msgstr "Képzési folyamat konfigurálása"
 
 msgid "Model Settings"
 msgstr ""
@@ -28388,7 +29035,7 @@ msgid "Train a Model"
 msgstr ""
 
 msgid "Start the training engine!"
-msgstr ""
+msgstr "Képzőmotor indítása!"
 
 msgid "Edit opening hours"
 msgstr "Nyitvatartási idő szerkesztése"
@@ -28981,6 +29628,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28990,6 +29660,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -29375,7 +30048,7 @@ msgid "Cadastral sections and subsections."
 msgstr ""
 
 msgid "Municipality administrative borders."
-msgstr ""
+msgstr "Település közigazgatási határai."
 
 msgid "Raster images grab multiplier:"
 msgstr ""
@@ -30515,13 +31188,13 @@ msgid "Road requirements"
 msgstr ""
 
 msgid "Max. incline up (%, pos.)"
-msgstr ""
+msgstr "Legnagyobb dőlésszög fölfelé (%, poz.)"
 
 msgid "Maximum incline the vehicle can go up"
 msgstr ""
 
 msgid "Max. incline down (%, pos.)"
-msgstr ""
+msgstr "Legnagyobb dőlésszög lefelé (%, poz.)"
 
 msgid "Maximum incline the vehicle can go down"
 msgstr ""
@@ -32463,10 +33136,10 @@ msgid "Max distance is not a number"
 msgstr "A maximális távolság nem egy szám"
 
 msgid "Joining nodes"
-msgstr "Pontok összekötése"
+msgstr "Pontok összekapcsolása"
 
 msgid "Joining adjacent segments"
-msgstr "Szomszédos szakaszok összekötése"
+msgstr "Szomszédos szakaszok összekapcsolása"
 
 msgid "Removing small objects"
 msgstr "Kis objektumok eltávolítása"
@@ -33202,7 +33875,7 @@ msgid "Catch"
 msgstr "Elkap"
 
 msgid "Join"
-msgstr "Összekapcsol"
+msgstr "Összekapcsolás"
 
 msgid "Public Transport: Join GTFS stops"
 msgstr "Tömegközlekedés: GTFSStops összekapcsolása"
@@ -33390,7 +34063,7 @@ msgstr "Szűrőválasztás"
 
 msgid "JSlider initialization error. Make sure your meta-inf is correct."
 msgstr ""
-"JSlider inicializálási hiba. Győződj meg arról, hogy a meta-inf helyes."
+"JSlider előkészítési hiba. Győződj meg arról, hogy a meta-inf helyes."
 
 msgid "Relation Toolbox"
 msgstr "Kapcsolat Eszköztár"
@@ -33448,7 +34121,7 @@ msgid "Move tags from ways to relation"
 msgstr "Címkék áthelyezése a vonalakról a kapcsolatra"
 
 msgid "Enter admin level and name for the border relation:"
-msgstr "Add meg a határvonal kapcsolat közigazgatási szintjét és nevét:"
+msgstr "A határvonal-kapcsolat közigazgatási szintje és neve:"
 
 msgid "Admin level"
 msgstr "Közigazgatási szint"
@@ -33693,24 +34366,6 @@ msgstr "Aláírás {0}"
 msgid "Additional sign {0}"
 msgstr "További {0} tábla"
 
-msgid "Edit relation"
-msgstr "Kapcsolat szerkesztése"
-
-msgid "Edit relations"
-msgstr "Kapcsolatok szerkesztése"
-
-msgid "No relation is selected"
-msgstr "Nincs kapcsolat kiválasztva"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "{1}. pozícióban lévő „{0}” pont eltávolítása „{2}” kapcsolatból"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "{1}. pozícióban lévő „{0}” vonal eltávolítása „{2}” kapcsolatból"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "{1}. pozícióban lévő „{0}” kapcsolat eltávolítása „{2}” kapcsolatból"
-
 msgid "routing active route"
 msgstr ""
 
@@ -33936,7 +34591,7 @@ msgid "Select none"
 msgstr ""
 
 msgid "Min Distance:"
-msgstr "Min. távolság"
+msgstr "Legkisebb távolság"
 
 msgid "Input min distance"
 msgstr "Input minimális távolság"
@@ -36057,9 +36712,9 @@ msgid ""
 "correctly installed on your system. Its architecture (32/64 bits) must also "
 "be the same as the JRE that runs JOSM."
 msgstr ""
-"A VLC könyvtár inicializálása nincs rendben. Kérlek, ellenőrizd, hogy a VLC "
-"{0} helyesen települt a gépeden. Az architektúrájának (32/64 bit) azonosnak "
-"kell lennie a JRE-vel, ami a JOSM-ot is futtatja."
+"A VLC könyvtár nincs helyesen előkészítve. Ellenőrizd, hogy a VLC {0} "
+"helyesen települt a gépeden. Az architektúrájának (32/64 bit) azonosnak kell "
+"lennie a JRE-vel, ami a JOSM-ot is futtatja."
 
 msgid "Jump to"
 msgstr "Ugrás oda"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index b0cdf2d..06b6964 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-04-13 21:51+0000\n"
 "Last-Translator: Gev777 <Unknown>\n"
 "Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:36+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:36+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: hy\n"
 
 msgid "Cancel"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 7ca8e4b..eae2007 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-08-29 01:02+0000\n"
 "Last-Translator: Emilio Sepulveda <Unknown>\n"
 "Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:51+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:52+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/id.po b/i18n/po/id.po
index c6aeaed..8ea54ec 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-03-10 03:36+0000\n"
 "Last-Translator: Ezagren <ezagren at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:52+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:53+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: id\n"
 "X-Language: id_ID\n"
 
@@ -5672,6 +5672,25 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "Versi mereka ({0} entries)"
 
+msgid "My version (local dataset)"
+msgstr "Versi saya (dataset lokal)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "properti berada di dataset saya, i.e. lokal dataset"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Properti pada elemen yang digabungkan. Itu akan mengganti properti pada "
+"elemen saya ketika saya menerapkan untuk menggabungkannya."
+
+msgid "Their version (server dataset)"
+msgstr "Versi mereka (server dataset)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Properti pada dataset mereka, co: dataset server"
+
 msgid "My with Their"
 msgstr "Milik saya dengan mereka"
 
@@ -5758,28 +5777,6 @@ msgstr ""
 "Gabungkan node/titik yang belum ter-frozen. Tidak dapat membangun perintah "
 "resolusi."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "properti berada di dataset saya, i.e. lokal dataset"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Properti pada elemen yang digabungkan. Itu akan mengganti properti pada "
-"elemen saya ketika saya menerapkan untuk menggabungkannya."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Properti pada dataset mereka, co: dataset server"
-
-msgid "Coordinates:"
-msgstr "Koordinat:"
-
-msgid "Deleted State:"
-msgstr "Status Penghapusan:"
-
-msgid "Referenced by:"
-msgstr "referensi oleh"
-
 msgid "(none)"
 msgstr "(tidak ada)"
 
@@ -5789,6 +5786,15 @@ msgstr "sudah dihapus"
 msgid "not deleted"
 msgstr "belum terhapus"
 
+msgid "Deleted State:"
+msgstr "Status Penghapusan:"
+
+msgid "Coordinates:"
+msgstr "Koordinat:"
+
+msgid "Referenced by:"
+msgstr "referensi oleh"
+
 msgid "Keep my coordinates"
 msgstr "Simpan koordinat saya"
 
@@ -5834,12 +5840,6 @@ msgstr "Key"
 msgid "Value"
 msgstr "Value"
 
-msgid "My version (local dataset)"
-msgstr "Versi saya (dataset lokal)"
-
-msgid "Their version (server dataset)"
-msgstr "Versi mereka (server dataset)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Simpan pasangan key/value yang dipilih dari lokal dataset"
 
@@ -10719,9 +10719,6 @@ msgstr "Tutup dialog dan batalkan perizinan"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Tutup dialog dan setujui Akses Token"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Mengambil perimintaan Token OAuth dari \"{0}\""
 
@@ -12561,8 +12558,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grid Swiss (Switzerland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (tanpa koreksi lokal)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13918,10 +13915,13 @@ msgstr "Pembacaan dibatalkan"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Hilang atribut wajib pada elemen \"batas''. Memiliki bujurrmin = "
-"''{0}'',lintangmin = \"{1}'',maxlon = \"{3}'',maxlat = \"{4}\", asal=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Hapus garis {0} yang mengandung titik-titi"
@@ -15173,9 +15173,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -15185,9 +15182,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15198,9 +15192,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15806,6 +15808,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15833,6 +15841,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15863,6 +15874,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15911,21 +15925,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15967,15 +15992,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15991,6 +16031,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16096,9 +16142,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -16108,6 +16160,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16192,9 +16247,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16210,31 +16292,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16253,13 +16364,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16268,21 +16379,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16301,6 +16422,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16313,6 +16437,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Kadaster"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16440,16 +16567,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16482,15 +16614,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16502,15 +16644,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16571,18 +16729,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16646,18 +16823,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16691,26 +16879,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16720,15 +16917,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16736,6 +16947,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16874,23 +17088,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16917,18 +17143,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16962,6 +17204,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -17040,12 +17285,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17101,8 +17354,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17177,9 +17430,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17231,240 +17495,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24143,6 +24782,9 @@ msgstr "Makanan Laut"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (Fine Food)"
 
@@ -26390,6 +27032,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relasi tanpa tipe"
 
@@ -27384,6 +28029,9 @@ msgstr ""
 msgid "Import"
 msgstr "import"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28322,6 +28970,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28331,6 +29002,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33089,24 +33763,6 @@ msgstr "Tanda {0}"
 msgid "Additional sign {0}"
 msgstr "Tanda tambahan {0}"
 
-msgid "Edit relation"
-msgstr "Edit relasi (tunggal)"
-
-msgid "Edit relations"
-msgstr "Edit Relasi (jamak)"
-
-msgid "No relation is selected"
-msgstr "Tidak ada relasi yang dipilih"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hapus node/titik \"{0}\" pada posisi {1} dari relasi \"{2}\""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hapus way/garis \"{0}\" pada posisi {1} dari relasi \"{2}\""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hapus relasi \"{0}\" pada posisi {1} dari relasi \"{2}\""
-
 msgid "routing active route"
 msgstr "Routing rute aktif"
 
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 3cc8057..a403f97 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-11-06 00:32+0000\n"
 "Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
 "Language-Team: Icelandic <is at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:51+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:52+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: is\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5412,6 +5412,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5494,33 +5511,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5568,12 +5574,6 @@ msgstr "Lykill"
 msgid "Value"
 msgstr "Gildi"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10151,9 +10151,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11860,7 +11857,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13131,7 +13128,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14252,9 +14254,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14264,9 +14263,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14277,9 +14273,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14862,6 +14866,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14889,6 +14899,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14919,6 +14932,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14967,21 +14983,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15023,15 +15050,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15047,6 +15089,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15152,9 +15200,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15164,6 +15218,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15248,9 +15305,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15266,31 +15350,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15309,13 +15422,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15324,21 +15437,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15357,6 +15480,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15369,6 +15495,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15496,16 +15625,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15538,15 +15672,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15558,15 +15702,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15627,18 +15787,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15702,18 +15881,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15747,26 +15937,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15776,15 +15975,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15792,6 +16005,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15930,23 +16146,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15973,18 +16201,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16018,6 +16262,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16096,12 +16343,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16157,8 +16412,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16182,345 +16437,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23107,6 +23748,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25352,6 +25996,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26324,6 +26971,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27176,6 +27826,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27185,6 +27858,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31722,24 +32398,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 214de8c..3d4e46c 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-05-02 14:16+0000\n"
-"Last-Translator: Moire <Unknown>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-17 06:36+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:52+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:53+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: it\n"
 "X-Language: it_IT\n"
 "X-Source-Language: en\n"
@@ -5938,6 +5938,27 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Loro versione ({0} voce)"
 msgstr[1] "Loro versione ({0} voci)"
 
+msgid "My version (local dataset)"
+msgstr "Versione personale (insieme di dati locale)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Proprietà nell''insieme di dati personale, cioè l''insieme di dati locale"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Proprietà nell''elemento unito. Queste sostituiranno le proprietà degli "
+"elementi personali non appena saranno applicate le decisioni."
+
+msgid "Their version (server dataset)"
+msgstr "Loro versione (insieme dei dati del server)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"Proprietà nel loro insieme di dati, cioè l''insieme di dati del server"
+
 msgid "My with Their"
 msgstr "Il mio con il loro"
 
@@ -6026,30 +6047,6 @@ msgstr ""
 "L''unione dei nodi non è stata ancora bloccata. Non è possibile costruire il "
 "comando di risoluzione"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Proprietà nell''insieme di dati personale, cioè l''insieme di dati locale"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Proprietà nell''elemento unito. Queste sostituiranno le proprietà degli "
-"elementi personali non appena saranno applicate le decisioni."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Proprietà nel loro insieme di dati, cioè l''insieme di dati del server"
-
-msgid "Coordinates:"
-msgstr "Coordinate:"
-
-msgid "Deleted State:"
-msgstr "Stato eliminato:"
-
-msgid "Referenced by:"
-msgstr "Referenziato da:"
-
 msgid "(none)"
 msgstr "(nessuno/a)"
 
@@ -6059,6 +6056,15 @@ msgstr "cancellato"
 msgid "not deleted"
 msgstr "non eliminato"
 
+msgid "Deleted State:"
+msgstr "Stato eliminato:"
+
+msgid "Coordinates:"
+msgstr "Coordinate:"
+
+msgid "Referenced by:"
+msgstr "Referenziato da:"
+
 msgid "Keep my coordinates"
 msgstr "Mantieni le mie coordinate"
 
@@ -6109,12 +6115,6 @@ msgstr "Chiave"
 msgid "Value"
 msgstr "Valore"
 
-msgid "My version (local dataset)"
-msgstr "Versione personale (insieme di dati locale)"
-
-msgid "Their version (server dataset)"
-msgstr "Loro versione (insieme dei dati del server)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Mantieni la coppia chiave/valore selezionata dall''insieme di dati locale"
@@ -8166,7 +8166,7 @@ msgstr "Nascondi"
 
 msgid "Refresh recent tags list after applying tag"
 msgstr ""
-"Aggiorna la lista delle etichette recenti dopo aver applicato un'etichetta"
+"Aggiorna la lista delle etichette recenti dopo aver applicato un’etichetta"
 
 msgid "No refresh"
 msgstr "Non aggiornare"
@@ -8375,7 +8375,7 @@ msgid "Refers to"
 msgstr "Fa riferimento a"
 
 msgid "Cannot add {0} since it is not part of dataset"
-msgstr "Impossibile aggiungere {0} perché non fa parte dell'insieme di dati"
+msgstr "Impossibile aggiungere {0} perché non fa parte dell’insieme di dati"
 
 msgid "Download referring relations"
 msgstr "Scarica le relazioni collegate"
@@ -10920,7 +10920,7 @@ msgid "Decrease zoom"
 msgstr "Diminuisci l''ingrandimento"
 
 msgid "Flush tile cache"
-msgstr ""
+msgstr "Svuota la cache dei tasselli"
 
 msgid "Increase zoom"
 msgstr "Aumenta l''ingrandimento"
@@ -11302,6 +11302,9 @@ msgid ""
 "sure to set an OAuth consumer key and secret in the <i>Advanced OAuth "
 "parameters</i>."
 msgstr ""
+"<strong>Attenzione:</strong>Dato che non si sta usando l’API OSM "
+"predefinita, assicurarsi di aver selezionato la chiave dell’utilizzatore e "
+"il codice segreto nei <i>parametri OAuth avanzati</i>."
 
 msgid "Get an Access Token for ''{0}''"
 msgstr "Ottieni un token di accesso per ''''{0}''''"
@@ -11312,9 +11315,6 @@ msgstr "Chiudi la finestra ed annulla l''autorizzazione"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Chiudi la finestra ed accetta il token di accesso"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Fallito l''annullamento dell''operazione OAuth in esecuzione"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Ottenimento del token di richiesta OAuth da ''''{0}''''"
 
@@ -12217,26 +12217,26 @@ msgstr ""
 
 msgctxt "Heat map"
 msgid "Traffic Lights"
-msgstr ""
+msgstr "Semaforico"
 
 msgctxt "Heat map"
 msgid "Inferno"
-msgstr ""
+msgstr "Infernale"
 
 msgctxt "Heat map"
 msgid "Viridis"
-msgstr ""
+msgstr "Viridis"
 
 msgctxt "Heat map"
 msgid "Wood"
-msgstr ""
+msgstr "Legno"
 
 msgctxt "Heat map"
 msgid "Heat"
-msgstr ""
+msgstr "Calore"
 
 msgid "Use points instead of lines for heat map"
-msgstr ""
+msgstr "Usa punti al posto di linee nella mappa di calore"
 
 msgid "Create markers when reading GPX"
 msgstr "Crea contrassegni durante la lettura GPX"
@@ -12251,7 +12251,7 @@ msgid "Smooth GPX graphics (antialiasing)"
 msgstr "Smussa la grafica GPX (antialiasing)"
 
 msgid "Draw with Opacity (alpha blending) "
-msgstr ""
+msgstr "Disegna con una certa opacità (canale alfa) "
 
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12327,6 +12327,8 @@ msgid ""
 "Apply dynamic alpha-blending and adjust width based on zoom level for all "
 "GPX lines."
 msgstr ""
+"Applica un canale alfa dinamico e regola la larghezza delle linee GPX a "
+"seconda del livello di zoom."
 
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12363,7 +12365,7 @@ msgstr ""
 "velocità medie."
 
 msgid "Selects the color schema for heat map."
-msgstr ""
+msgstr "Seleziona uno schema di colori per la mappa di calore"
 
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
@@ -12472,11 +12474,13 @@ msgid ""
 msgstr ""
 
 msgid "Zoom steps to get double scale"
-msgstr ""
+msgstr "Passi di ingrandimento per raddoppiare la scala"
 
 msgid ""
 "Higher value means more steps needed, therefore zoom steps will be smaller"
 msgstr ""
+"Un valore grande corrisponde ad un numero maggiore di passi necessario, "
+"pertanto ogni passo ingrandirà di meno la mappa"
 
 msgid "Look and Feel"
 msgstr "Aspetto e stile"
@@ -12632,6 +12636,8 @@ msgstr "Voci predefinite disponibili:"
 
 msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
 msgstr ""
+"Nuovi valori predefiniti  possono essere aggiunti nella <a "
+"href=\"{0}\">Wiki</a>."
 
 msgid "Selected entries:"
 msgstr "Voci selezionate:"
@@ -13035,14 +13041,16 @@ msgid "Disable all other plugins"
 msgstr "Disabilita tutti gli altri plugin"
 
 msgid "Enter a list of plugins you want to download."
-msgstr ""
+msgstr "Selezionare una lista di plugin da scaricare"
 
 msgid ""
 "You should add one plugin id per line, version information is ignored."
 msgstr ""
+"Dovrebbe essere aggiunto un id di plugin per linea, eventuali informazioni "
+"di versione saranno ignorate."
 
 msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "È possibile copia-incollare la lista di un rapporto di stato qui."
 
 msgid "Load plugins from list"
 msgstr "Scarica plugin da una lista"
@@ -13234,8 +13242,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Sistema di coordinate svizzero (Svizzera)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (senza alcuna correzione locale)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupa Fort-Marigot 1949"
@@ -13528,7 +13536,7 @@ msgid "Please enter the OSM API URL."
 msgstr "Si prega di inserire l’indirizzo URL delle API di OSM."
 
 msgid "Use Overpass server for object downloads"
-msgstr ""
+msgstr "Usa il server Overpass per scaricare gli oggetti"
 
 msgid "Overpass server: "
 msgstr "Server Overpass: "
@@ -13727,7 +13735,7 @@ msgid "Territories"
 msgstr "Territori"
 
 msgid "Checks for territories-specific features"
-msgstr ""
+msgstr "Controlla caratteristiche specifiche di un territorio"
 
 msgid "Unnecessary tags"
 msgstr "Etichette non necessarie"
@@ -13813,7 +13821,7 @@ msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
 msgid "This preset also sets: {0}"
-msgstr ""
+msgstr "Questa preimpostazione imposta anche: {0}"
 
 msgid "Edit also …"
 msgstr "Modificare anche …"
@@ -13827,6 +13835,8 @@ msgstr "Nuova relazione"
 msgid ""
 "The preset <i>{0}</i> cannot be applied since nothing has been selected!"
 msgstr ""
+"La preimpostazione <i>{0}</i> non può essere applicata dato che non è "
+"selezionato alcun oggetto!"
 
 msgid ""
 "The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
@@ -14688,10 +14698,13 @@ msgstr "La lettura è stata annullata"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Attributi obbligatori mancanti sull''elemento ''bounds''. Ottenuti "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Il percorso eliminato {0} contiene dei nodi"
@@ -16079,9 +16092,6 @@ msgstr "URL in apertura: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "L''indirizzo URL non contiene {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "riservato"
-
 msgid "Outdated Java version"
 msgstr "Versione Java obsoleta"
 
@@ -16091,9 +16101,6 @@ msgstr "Aggiornare Java"
 msgid "You are running version {0} of Java."
 msgstr "Si sta eseguendo la versione {0} di Java."
 
-msgid "April 2015"
-msgstr "Aprile 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -16108,9 +16115,17 @@ msgstr ""
 "JOSM a breve non funzionerà più con questa versione; si consiglia vivamente "
 "di aggiornare a Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Si desidera aggiornare adesso ?"
 
+msgid "reserved"
+msgstr "riservato"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16739,6 +16754,12 @@ msgstr "HDM (gruppo OSM a scopo umanitario)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16766,6 +16787,9 @@ msgstr "OpenStreetMap (Stile tedesco)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "Tracce GPS OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Trasporto pubblico locale (TPL)"
 
@@ -16796,6 +16820,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA Nessun Indirizzo"
 
@@ -16844,21 +16871,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16900,15 +16938,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16924,6 +16977,12 @@ msgstr "Tiris: DOM (modello superficie)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (mappa di vienne uso generico)"
 
@@ -17029,9 +17088,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mappa dei Settori Urbani"
 
@@ -17041,6 +17106,9 @@ msgstr "IBGE Mappa dei Settori Rurali"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -17125,9 +17193,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Idrografia Geobase"
 
@@ -17143,31 +17238,60 @@ msgstr "Mosaico British Columbia"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna strade in sovraimpressione"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Rep. Ceca CUZK:KM"
 
@@ -17186,14 +17310,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Danimarca)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -17201,21 +17325,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danimarca)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danimarca)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -17234,6 +17368,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17246,6 +17383,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Catasto"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17374,16 +17514,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17416,15 +17561,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17436,15 +17591,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -17505,18 +17676,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17580,18 +17770,29 @@ msgstr "Alto Adige Ortofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Ortofoto Alto Adige 2011 (alta risoluzione)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Ortofoto Alto Adige 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Topomap Alto Adige"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Lettonia"
 
@@ -17625,26 +17826,35 @@ msgstr "Lussemburgo Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta del Niger Ott 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthofoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17654,15 +17864,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17670,6 +17894,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17808,23 +18035,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17851,18 +18090,34 @@ msgstr "RABA-KGZ: Slovenia aree edificate"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Foto aerea Città del Capo 2013"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Foto aerea Città del Capo 2015"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17896,6 +18151,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17974,12 +18232,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (con Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Confini di villaggio"
 
@@ -18035,8 +18301,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -18111,9 +18377,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Ortofoto del Delaware 2012"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -18165,240 +18442,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -25163,6 +25815,9 @@ msgstr "Pescheria"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Cibi e bevande pregiate"
 
@@ -27447,6 +28102,9 @@ msgstr "{0} deve essere un numero intero positivo"
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relazione senza tipo"
 
@@ -28456,6 +29114,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importa"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29445,6 +30106,29 @@ msgstr "Debug"
 msgid "Debugging mode will write images for each processing step."
 msgstr "la modalità debugging scriverà immagini per ogni fase del processo."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29454,6 +30138,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -34303,26 +34990,6 @@ msgstr "Segnale stradale {0}"
 msgid "Additional sign {0}"
 msgstr "Segnale stradale supplementare {0}"
 
-msgid "Edit relation"
-msgstr "Modifica la relazione"
-
-msgid "Edit relations"
-msgstr "Modifica le relazioni"
-
-msgid "No relation is selected"
-msgstr "Nessuna relazione selezionata"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Rimuovi il nodo ''{0}'' alla posizione {1} dalla relazione ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Rimuovi la relazione ''{0}'' alla posizione {1} dalla relazione ''{2}''"
-
 msgid "routing active route"
 msgstr "navigazione itinerario attivo"
 
@@ -35445,16 +36112,16 @@ msgid "check the right direction of the way"
 msgstr ""
 
 msgid "Unidirectional road"
-msgstr ""
+msgstr "Strada a senso unico"
 
 msgid "Build unidirectional road"
-msgstr ""
+msgstr "Crea strada a senso unico"
 
 msgid "Bidirectional road"
-msgstr ""
+msgstr "Strada a doppio senso"
 
 msgid "Build bidirectional road"
-msgstr ""
+msgstr "Crea strada a doppio senso"
 
 msgid "Use \"none\""
 msgstr ""
@@ -35490,7 +36157,7 @@ msgid "Number of lanes"
 msgstr ""
 
 msgid "Directional"
-msgstr ""
+msgstr "Direzionale"
 
 msgid "Turn lanes"
 msgstr ""
@@ -36948,19 +37615,23 @@ msgstr "Copia {0} modello"
 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] ""
+"Sovrascrivere l’etichetta ''{0}'' {1} avente valore {2} con il nuovo valore "
+"''{3}''?"
 msgstr[1] ""
+"Sovrascrivere le etichette ''{0}'' {1} aventi valori {2} con i nuovi valori "
+"''{3}''?"
 
 msgid "Search Wikidata items"
-msgstr ""
+msgstr "Cerca elementi Wikidata"
 
 msgid "Target key: "
-msgstr ""
+msgstr "Chiave di destinazione: "
 
 msgid "Search Wikipedia category"
-msgstr ""
+msgstr "Cerca categoria Wikipedia"
 
 msgid "Load category"
-msgstr ""
+msgstr "Carica categoria"
 
 msgid "Fetch Wikipedia articles with coordinates"
 msgstr "Ottieni gli articoli di Wikipedia con coordinate"
@@ -36982,13 +37653,15 @@ msgid "Not linked yet"
 msgstr "Non ancora collegato"
 
 msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
 
 msgid "Wikidata"
 msgstr "Wikidata"
 
 msgid "Fetches all coordinates from Wikidata in the current view"
 msgstr ""
+"Ottiene tutte le coordinate da Wikidata relative alla visualizzazione "
+"corrente"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr ""
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index ad141c2..6ca36a8 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-21 15:53+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-09 15:05+0000\n"
 "Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
 "Language-Team: Japanese <tr at openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:53+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:54+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "X-Poedit-Country: JAPAN\n"
 "Language: ja\n"
 "X-Poedit-Language: Japanese\n"
@@ -771,7 +771,7 @@ msgid "Custom WMS Link"
 msgstr "カスタムWMS リンク"
 
 msgid "Supported Rectifier Services:"
-msgstr "サポートされるRectifier サービス:"
+msgstr "対応しているRectifier サービス:"
 
 msgid "Visit Homepage"
 msgstr "ホームページはこちら"
@@ -3355,7 +3355,7 @@ msgstr ""
 msgid ""
 "Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
 "identifier {2}"
-msgstr "正方形のタイルのみをサポートしています。 TileMatrix identifier {2} のサーバが{0}x{1}を返しました。"
+msgstr "正方形のタイルのみに対応しています。 TileMatrix identifier {2} のサーバが{0}x{1}を返しました。"
 
 msgid "ID > 0 expected. Got {0}."
 msgstr "IDは0より大きくなければなりませんが、{0}でした。"
@@ -3547,7 +3547,7 @@ msgid "Expected element ''{0}'', but got ''{1}''"
 msgstr "''{0}'' 要素が必要ですが、 ''{1}'' が現れました"
 
 msgid "value expected"
-msgstr ""
+msgstr "値が必要です"
 
 msgid "UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."
 msgstr "UTM 投影法 (''+proj=utm'') には ''+zone=...'' パラメーターが必要です。"
@@ -3574,13 +3574,13 @@ msgid "Unexpected parameter format (''{0}'')"
 msgstr "パラメーターの書式が違います(''{0}'')"
 
 msgid "Value ''{0}'' for option +init not supported."
-msgstr "+initオプションで''{0}''の値は使用できません。"
+msgstr "+initオプションで''{0}''の値は対応していません。"
 
 msgid "Ellipsoid ''{0}'' not supported."
-msgstr "楕円 ''{0}'' は使用できません。"
+msgstr "楕円 ''{0}'' は対応していません。"
 
 msgid "Combination of ellipsoid parameters is not supported."
-msgstr "楕円のパラメーターの組み合わせは使用できません。"
+msgstr "楕円のパラメーターの組み合わせは対応していません。"
 
 msgid "Unknown datum identifier: ''{0}''"
 msgstr "データ識別子''{0}''が不明です"
@@ -3589,7 +3589,7 @@ msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
 msgstr "楕円には +ellps=* または+a=*, +b=* が必要です"
 
 msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
-msgstr "+nadgrids オプションに指定されたグリッドシフトファイル ''{0}'' はサポートされていません。"
+msgstr "+nadgrids オプションに指定されたグリッドシフトファイル ''{0}'' は対応していません。"
 
 msgid ""
 "Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -4133,7 +4133,7 @@ msgid "Unexpected token in year range:"
 msgstr "年の範囲に想定外のトークンがあります:"
 
 msgid "Invalid/unsupported syntax."
-msgstr "無効またはサポートされていない文法です。"
+msgstr "無効または対応していない文法です。"
 
 msgid "Overlapping ways"
 msgstr "重なったウェイ"
@@ -5422,6 +5422,23 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "相手のバージョン({0}項目)"
 
+msgid "My version (local dataset)"
+msgstr "自分のバージョン(ローカルデータセット)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "自分のデータセットのプロパティ、例:ローカルデータセット"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr "結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプロパティを置換します。"
+
+msgid "Their version (server dataset)"
+msgstr "相手のバージョン(サーバーデータセット)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "相手のデータセットのプロパティ、例:ローカルデータセット"
+
 msgid "My with Their"
 msgstr "自分と相手"
 
@@ -5502,26 +5519,6 @@ msgstr "ノード"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "自分のデータセットのプロパティ、例:ローカルデータセット"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr "結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプロパティを置換します。"
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "相手のデータセットのプロパティ、例:ローカルデータセット"
-
-msgid "Coordinates:"
-msgstr "座標:"
-
-msgid "Deleted State:"
-msgstr "削除済み状態:"
-
-msgid "Referenced by:"
-msgstr "参照元:"
-
 msgid "(none)"
 msgstr "(なし)"
 
@@ -5531,6 +5528,15 @@ msgstr "削除しました"
 msgid "not deleted"
 msgstr "削除されていません"
 
+msgid "Deleted State:"
+msgstr "削除済み状態:"
+
+msgid "Coordinates:"
+msgstr "座標:"
+
+msgid "Referenced by:"
+msgstr "参照元:"
+
 msgid "Keep my coordinates"
 msgstr "自分の判断を採用"
 
@@ -5576,12 +5582,6 @@ msgstr "キー"
 msgid "Value"
 msgstr "値"
 
-msgid "My version (local dataset)"
-msgstr "自分のバージョン(ローカルデータセット)"
-
-msgid "Their version (server dataset)"
-msgstr "相手のバージョン(サーバーデータセット)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "ローカルデータセットから選択されたキー/値のペアを残す"
 
@@ -7745,10 +7745,10 @@ msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
 msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "リレーションエディタ: 更新"
 
 msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "データレイヤからリレーションを更新"
 
 msgid "Refresh"
 msgstr "リフレッシュ"
@@ -7757,12 +7757,13 @@ msgid "Yes, discard changes and reload"
 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 "クリックするとウィンドウを閉じます"
@@ -7773,7 +7774,7 @@ msgstr "いいえ、編集を続ける"
 msgid ""
 "<html>Relation has been deleted outside editor.<br><br>Do you want to close "
 "this window?</html>"
-msgstr ""
+msgstr "<html>リレーションがエディタの外で削除されました。<br><br>このウィンドウを閉じますか?</html>"
 
 msgid "Deleted relation"
 msgstr "リレーションを削除"
@@ -7995,10 +7996,10 @@ msgstr ""
 "</html>"
 
 msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "ダウンロードしたデータにズーム"
 
 msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "新しくダウンロードしたデータ全体へのズームを選択します。"
 
 msgid ""
 "Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -8740,7 +8741,7 @@ msgid "Perform actions before restarting"
 msgstr "再起動前の動作"
 
 msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
+msgstr "保存してJOSMを再起動します。未保存の変更はアップロードまたは保存されます。"
 
 msgid "Perform actions before deleting"
 msgstr "削除前に動作を実行"
@@ -9149,7 +9150,7 @@ msgid "Tile display projection"
 msgstr ""
 
 msgid "Current zoom"
-msgstr ""
+msgstr "現在のズーム"
 
 msgid "Show tile info"
 msgstr "タイル情報を表示"
@@ -9158,16 +9159,16 @@ msgid "Tile Info"
 msgstr "タイル情報"
 
 msgid "Tile name"
-msgstr ""
+msgstr "タイル名"
 
 msgid "Tile URL"
-msgstr ""
+msgstr "タイルのURL"
 
 msgid "Tile size"
-msgstr ""
+msgstr "タイルサイズ"
 
 msgid "Tile display size"
-msgstr ""
+msgstr "タイル表示サイズ"
 
 msgid "Reprojection"
 msgstr ""
@@ -9299,7 +9300,7 @@ msgid "Max. zoom"
 msgstr ""
 
 msgid "Unsupported imagery type: {0}"
-msgstr "サポートされていない画像種別: {0}"
+msgstr "対応していない画像種別: {0}"
 
 msgid "Next marker"
 msgstr "次のマーカー"
@@ -9314,7 +9315,7 @@ msgid "Jump to previous marker"
 msgstr "前のマーカーにジャンプ"
 
 msgid "All projections are supported"
-msgstr "投影法はすべてサポートされています"
+msgstr "すべての投影法に対応しています"
 
 msgid "The layer {0} does not support the new projection {1}."
 msgstr "レイヤー {0} は新しい投影法 {1} に対応していません。"
@@ -9330,8 +9331,7 @@ msgstr "レイヤーを保存"
 
 msgid "{0} note"
 msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0}件のメモ"
 
 msgid "Notes layer"
 msgstr "メモレイヤー"
@@ -9368,7 +9368,7 @@ msgid "Upload is discouraged"
 msgstr "アップロード抑制中"
 
 msgid "Upload is blocked"
-msgstr ""
+msgstr "アップロードがブロックされました"
 
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
@@ -9848,7 +9848,7 @@ msgid "gps point"
 msgstr "GPSポイント"
 
 msgid "HDOP"
-msgstr ""
+msgstr "HDOP"
 
 msgid "Time"
 msgstr "時間"
@@ -10260,9 +10260,6 @@ msgstr "ダイアログを閉じて認証をキャンセル"
 msgid "Close the dialog and accept the Access Token"
 msgstr "ダイアログを閉じてアクセストークンを受け入れる"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "実行中のOAuth操作のキャンセルに失敗しました"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "''{0}''からOAuthリクエストトークンを取得中"
 
@@ -11256,7 +11253,7 @@ msgid "Display ISO dates"
 msgstr "ISO日付で表示"
 
 msgid "Use native file choosers (nicer, but do not support file filters)"
-msgstr "ネイティブのファイル選択を使用(より良いが、ファイルフィルターがサポートされない)"
+msgstr "ネイティブのファイル選択を使用(より良いが、ファイルフィルターに対応しない)"
 
 msgid "Reverse zoom with mouse wheel"
 msgstr "マウスホイールでのズームを反転"
@@ -11286,7 +11283,7 @@ msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
 "not support some features like file filters"
 msgstr ""
-"よりネイティブのものに近い動きをするファイル選択ダイアログを使用します。外見はより良いですが、ファイルフィルターなどいくつかの機能がサポートされていません"
+"よりネイティブのものに近い動きをするファイル選択ダイアログを使用します。外見はより良いですが、ファイルフィルタなどいくつかの機能に対応していません"
 
 msgid "Check if you feel opposite direction more convenient"
 msgstr ""
@@ -11516,7 +11513,7 @@ msgid ""
 "That layer does not support any of JOSM''s projections,\n"
 "so you can not use it. This message will not show again."
 msgstr ""
-"このレイヤーはJOSMのどの投影法もサポートしていないため、\n"
+"このレイヤーはJOSMのどの投影法も対応していないため、\n"
 "使用することができません。このメッセージは再表示されません。"
 
 msgid "Simultaneous connections:"
@@ -12000,8 +11997,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (ローカル補正なし)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13294,11 +13291,13 @@ msgstr "読み込みがキャンセルされました"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"''bounds'' 要素に必要な属性がかけています。 "
-"minlon=''{0}''、minlat=''{1}''、maxlon=''{3}''、maxlat=''{4}''、origin=''{5}'' "
-"が指定されています。"
 
 msgid "Deleted way {0} contains nodes"
 msgstr "削除されたウェイ {0} にはノードがあります"
@@ -14464,9 +14463,6 @@ msgstr "URL {0} を開きます"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URLが{0}/{1}/{2}を含んでいません"
 
-msgid "reserved"
-msgstr "予約"
-
 msgid "Outdated Java version"
 msgstr "Javaのバージョンが期限切れ"
 
@@ -14476,9 +14472,6 @@ msgstr "Javaを更新"
 msgid "You are running version {0} of Java."
 msgstr "あなたはJavaバージョン{0}を使用しています。"
 
-msgid "April 2015"
-msgstr "2015年4月"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14489,9 +14482,17 @@ msgid ""
 "update to Java {0}."
 msgstr "JOSMは間もなくこのバージョンでは動作しなくなります。Java{0}にアップデートすることを強くお勧めします。"
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "今すぐ更新しますか?"
 
+msgid "reserved"
+msgstr "予約"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15083,6 +15084,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -15110,6 +15117,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS トレース"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
 
@@ -15140,6 +15150,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -15188,21 +15201,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15244,15 +15268,30 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -15268,6 +15307,12 @@ msgstr "Tiris: DOM (Surface model)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -15373,9 +15418,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -15385,6 +15436,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15469,9 +15523,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -15487,31 +15568,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -15530,14 +15640,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -15545,21 +15655,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -15578,6 +15698,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -15590,6 +15713,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -15719,16 +15845,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15761,15 +15892,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15781,15 +15922,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -15850,18 +16007,37 @@ msgstr "Hillshade Hungary"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -15925,18 +16101,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -15970,26 +16157,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -15999,15 +16195,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16015,6 +16225,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16153,23 +16366,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16196,18 +16421,34 @@ msgstr "RABA-KGZ: Slovenia built-up areas"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16241,6 +16482,9 @@ msgstr "GRAFCAN Express - Canary Islands"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -16319,12 +16563,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (with Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Village Boundaries"
 
@@ -16380,8 +16632,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16456,9 +16708,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -16510,240 +16773,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23339,7 +23977,7 @@ msgstr "宗教施設"
 
 msgctxt "building"
 msgid "wayside_shrine"
-msgstr ""
+msgstr "地蔵、道祖神"
 
 msgid "Boundary Stone"
 msgstr "境界石"
@@ -23371,6 +24009,9 @@ msgstr "水産物店"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "惣菜屋"
 
@@ -23940,16 +24581,16 @@ msgid "Stonemason"
 msgstr "石材加工店"
 
 msgid "Handicraft"
-msgstr ""
+msgstr "日用品工房"
 
 msgid "Pottery"
 msgstr "窯元"
 
 msgid "Key cutter"
-msgstr ""
+msgstr "合鍵屋"
 
 msgid "Caterer"
-msgstr ""
+msgstr "仕出し店"
 
 msgid "Roofer"
 msgstr "屋根屋"
@@ -24392,7 +25033,7 @@ msgid "cherry_trees"
 msgstr "さくらんぼ"
 
 msgid "persimmon_trees"
-msgstr ""
+msgstr "柿"
 
 msgid "walnut_trees"
 msgstr "クルミの木"
@@ -24404,7 +25045,7 @@ msgid "peach_trees"
 msgstr "桃の木"
 
 msgid "tea_plants"
-msgstr ""
+msgstr "お茶"
 
 msgid "Vineyard"
 msgstr "ぶどう畑"
@@ -25401,7 +26042,7 @@ msgid ""
 msgstr "{0}={1}は未定義です。''{1}''を''left''、''right''、''both''のいずれかに置き換えてください。"
 
 msgid "Unspecific tag {0}"
-msgstr ""
+msgstr "定義されていないタグ {0}"
 
 msgid "Definition of {0} is unclear"
 msgstr ""
@@ -25411,7 +26052,7 @@ msgstr ""
 
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
-msgstr ""
+msgstr "{0} は推奨されません。ツールメニューのウェイ方向反転を使って下さい。"
 
 msgid "{0}"
 msgstr ""
@@ -25617,6 +26258,9 @@ msgstr "{0}は正の整数でなければなりません"
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "種別がないリレーション"
 
@@ -26314,7 +26958,7 @@ msgid "Total images:"
 msgstr ""
 
 msgid "images"
-msgstr ""
+msgstr "画像"
 
 msgid "Mapillary object layer"
 msgstr ""
@@ -26459,13 +27103,13 @@ msgid "No turn"
 msgstr ""
 
 msgid "Years"
-msgstr ""
+msgstr "年"
 
 msgid "Months"
-msgstr ""
+msgstr "ヶ月"
 
 msgid "Days"
-msgstr ""
+msgstr "日"
 
 msgid "Imported images"
 msgstr ""
@@ -26564,7 +27208,7 @@ msgid "Download mode"
 msgstr ""
 
 msgid "You are logged in as ''{0}''."
-msgstr ""
+msgstr "''{0}'' としてログイン中です。"
 
 msgid "You are currently not logged in."
 msgstr "ログインしていません"
@@ -26599,6 +27243,9 @@ msgstr ""
 msgid "Import"
 msgstr "インポート"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27532,6 +28179,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27541,6 +28211,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32167,24 +32840,6 @@ msgstr "標識 {0}"
 msgid "Additional sign {0}"
 msgstr "補助標識 {0}"
 
-msgid "Edit relation"
-msgstr "リレーションを編集"
-
-msgid "Edit relations"
-msgstr "リレーションを編集"
-
-msgid "No relation is selected"
-msgstr "リレーションが選択されていません"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "ノード ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "ウェイ ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "リレーション ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
 msgid "routing active route"
 msgstr "アクティブな経路をたどる"
 
@@ -33298,16 +33953,16 @@ msgid "Number of forward lanes"
 msgstr ""
 
 msgid "Both way"
-msgstr ""
+msgstr "j"
 
 msgid "Number of lanes"
-msgstr ""
+msgstr "車線数"
 
 msgid "Directional"
 msgstr ""
 
 msgid "Turn lanes"
-msgstr ""
+msgstr "右左折車線"
 
 msgid "No such lane."
 msgstr "そのような車線はありません。"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index c96f713..d28a5f7 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-12-16 00:14+0000\n"
 "Last-Translator: datogogishvili <Unknown>\n"
 "Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:46+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:46+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ka\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5396,6 +5396,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5478,33 +5495,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5552,12 +5558,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10121,9 +10121,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11820,7 +11817,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13089,7 +13086,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14206,9 +14208,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14218,9 +14217,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14231,9 +14227,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14816,6 +14820,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14843,6 +14853,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14873,6 +14886,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14921,21 +14937,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14977,15 +15004,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15001,6 +15043,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15106,9 +15154,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15118,6 +15172,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15202,9 +15259,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15220,31 +15304,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15263,13 +15376,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15278,21 +15391,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15311,6 +15434,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15323,6 +15449,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15450,16 +15579,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15492,15 +15626,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15512,15 +15656,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15581,18 +15741,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15656,18 +15835,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15701,26 +15891,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15730,15 +15929,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15746,6 +15959,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15884,23 +16100,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15927,18 +16155,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15972,6 +16216,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16050,12 +16297,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16111,8 +16366,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16136,345 +16391,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23060,6 +23701,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25305,6 +25949,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26277,6 +26924,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27129,6 +27779,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27138,6 +27811,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31675,24 +32351,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/km.po b/i18n/po/km.po
index ee74f74..08958a4 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-01-27 10:25+0000\n"
 "Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
 "Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:53+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:54+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5704,6 +5704,29 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "កំណែ​របស់​ពួកគេ ({0} ធាតុ)"
 
+msgid "My version (local dataset)"
+msgstr "កំណែ​របស់​ខ្ញុំ (សំណុំ​ទិន្នន័យ​មូលដ្ឋាន)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"លក្ខណសម្បត្តិ​នៅ​ក្នុង​សំណុំ​ទិន្នន័យ​របស់​ខ្ញុំ។ គឺ​សំណុំ​ទិន្នន័យ​មូលដ្ឋាន"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"លក្ខណសម្បត្តិ​នៅ​ក្នុង​ធាតុ​ដែល​បាន​បញ្ចូល​គ្នា។ "
+"ពួកគេ​នឹង​ជំនួស​លក្ខណសម្បត្តិ​នៅ​ក្នុង​ធាតុ​របស់​ខ្ញុំ "
+"ពេល​ដែល​ការ​សម្រេចចិត្ត​បញ្ចូល​គ្នា​ត្រូវ​បាន​អនុវត្ត។"
+
+msgid "Their version (server dataset)"
+msgstr "កំណែ​របស់​ពួកគេ (សំណុំ​ទិន្នន័យ​ម៉ាស៊ីន​មេ)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+"លក្ខណសម្បត្តិ​នៅ​ក្នុង​សំណុំ​មូលដ្ឋាន​ទិន្នន័យ "
+"គឺ​សំណុំ​មូលដ្ឋាន​ទិន្នន័យ​ម៉ាស៊ីន​មេ"
+
 msgid "My with Their"
 msgstr "របស់​ខ្ញុំ​ជាមួយ​របស់​គេ"
 
@@ -5790,32 +5813,6 @@ msgstr ""
 "កំណែ​ដែល​បាន​បញ្ចូល​គ្នា មិនទាន់​បង្កក​នៅឡើយ​ទេ។ "
 "មិន​អាច​បង្កើត​ពាក្យ​បញ្ជា​គុណភាព​បង្ហាញ។"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"លក្ខណសម្បត្តិ​នៅ​ក្នុង​សំណុំ​ទិន្នន័យ​របស់​ខ្ញុំ។ គឺ​សំណុំ​ទិន្នន័យ​មូលដ្ឋាន"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"លក្ខណសម្បត្តិ​នៅ​ក្នុង​ធាតុ​ដែល​បាន​បញ្ចូល​គ្នា។ "
-"ពួកគេ​នឹង​ជំនួស​លក្ខណសម្បត្តិ​នៅ​ក្នុង​ធាតុ​របស់​ខ្ញុំ "
-"ពេល​ដែល​ការ​សម្រេចចិត្ត​បញ្ចូល​គ្នា​ត្រូវ​បាន​អនុវត្ត។"
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"លក្ខណសម្បត្តិ​នៅ​ក្នុង​សំណុំ​មូលដ្ឋាន​ទិន្នន័យ "
-"គឺ​សំណុំ​មូលដ្ឋាន​ទិន្នន័យ​ម៉ាស៊ីន​មេ"
-
-msgid "Coordinates:"
-msgstr "កូអរដោណេ៖"
-
-msgid "Deleted State:"
-msgstr "បាន​លុប​ស្ថានភាព៖"
-
-msgid "Referenced by:"
-msgstr "យោង​តាម៖"
-
 msgid "(none)"
 msgstr "(គ្មាន)"
 
@@ -5825,6 +5822,15 @@ msgstr "បាន​លុបចោល"
 msgid "not deleted"
 msgstr "មិន​បាន​លុបចោល"
 
+msgid "Deleted State:"
+msgstr "បាន​លុប​ស្ថានភាព៖"
+
+msgid "Coordinates:"
+msgstr "កូអរដោណេ៖"
+
+msgid "Referenced by:"
+msgstr "យោង​តាម៖"
+
 msgid "Keep my coordinates"
 msgstr "រក្សា​កូអរដោណេ​ខ្ញុំ"
 
@@ -5873,12 +5879,6 @@ msgstr "កូនសោ"
 msgid "Value"
 msgstr "តម្លៃ"
 
-msgid "My version (local dataset)"
-msgstr "កំណែ​របស់​ខ្ញុំ (សំណុំ​ទិន្នន័យ​មូលដ្ឋាន)"
-
-msgid "Their version (server dataset)"
-msgstr "កំណែ​របស់​ពួកគេ (សំណុំ​ទិន្នន័យ​ម៉ាស៊ីន​មេ)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "រក្សា​គូ​តម្លៃ/ពាក្យ​គន្លឹះ​ដែល​បាន​ជ្រើស​ចេញពី​សំណុំ​ទិន្នន័យ​មូលដ្ឋាន"
@@ -10886,9 +10886,6 @@ msgstr "បិទ​ប្រអប់ រួច​បោះបង់​កា
 msgid "Close the dialog and accept the Access Token"
 msgstr "បិទ​ប្រអប់ និង​ព្រម​ទទួល​ថូខឹន​ចូល​ដំណើរការ"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បោះបង់​ដំណើរការ OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "ទៅ​យក​ថូខឹន​សំណើ OAuth ពី ''{0}''"
 
@@ -12752,8 +12749,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (ស្វីស)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (ដោយ​គ្មាន​ការ​កែតម្រូវ​មូលដ្ឋាន)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14174,10 +14171,13 @@ msgstr "បាន​បោះបង់​ការ​អាន"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"បាត់​គុណ​លក្ខណៈ​ចាំបាច់​នៅ​លើ​ធាតុ ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}'' ។"
 
 msgid "Deleted way {0} contains nodes"
 msgstr "បាន​លុប​ផ្លូវ {0} មាន​តំណ"
@@ -15483,9 +15483,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr "កំណែ Java ហួស​សម័យ"
 
@@ -15495,9 +15492,6 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព Java"
 msgid "You are running version {0} of Java."
 msgstr "អ្នក​កំពុង​ប្រើ Java កំណែ {0} ។"
 
-msgid "April 2015"
-msgstr "ខែ​មេសា ឆ្នាំ២០១៥"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15511,9 +15505,17 @@ msgstr ""
 "JOSM ឆាប់ៗ​នឹង​លែង​ដំណើរការ​ជាមួយ​កំណែ​នេះ "
 "យើង​សូម​ឲ្យ​អ្នក​ធ្វើ​បច្ចុប្បន្នភាព​ទៅ Java {0} ។"
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "តើ​អ្នក​ចង់​ធ្វើ​បច្ចុប្បន្នភាព​ឥឡូវ?"
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16139,6 +16141,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -16166,6 +16174,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -16196,6 +16207,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -16244,21 +16258,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16300,15 +16325,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16324,6 +16364,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16429,9 +16475,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -16441,6 +16493,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16525,9 +16580,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16543,31 +16625,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16586,13 +16697,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16601,21 +16712,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16634,6 +16755,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16646,6 +16770,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16773,16 +16900,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16815,15 +16947,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16835,15 +16977,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16904,18 +17062,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16979,18 +17156,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -17024,26 +17212,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -17053,15 +17250,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17069,6 +17280,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17207,23 +17421,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17250,18 +17476,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17295,6 +17537,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -17373,12 +17618,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17434,8 +17687,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17510,9 +17763,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17564,240 +17828,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24470,6 +25109,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -26715,6 +27357,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -27687,6 +28332,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28539,6 +29187,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28548,6 +29219,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33085,24 +33759,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 77d34c1..db04222 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-30 02:42+0000\n"
-"Last-Translator: SeongHoon Ryu <Unknown>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-17 08:29+0000\n"
+"Last-Translator: Glados <Unknown>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:54+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:55+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ko\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -514,7 +514,7 @@ msgid "Follow line"
 msgstr "줄 따라가기"
 
 msgid "Continues drawing a line that shares nodes with another line."
-msgstr ""
+msgstr "다른 선과 점을 공유하는 선을 그리세요."
 
 msgid "Follow"
 msgstr "팔로우"
@@ -634,7 +634,7 @@ msgid "No intersection found. Nothing was changed."
 msgstr "교차점을 찾을 수 없습니다. 아무것도 변경되지 않습니다."
 
 msgid "Move tags from ways to relations"
-msgstr ""
+msgstr "태그를 길에서 관계로 이동"
 
 msgid "Reverting changes"
 msgstr "변경사항 되돌리기"
@@ -5377,6 +5377,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5459,35 +5476,24 @@ msgstr "점"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgid "(none)"
+msgstr "(없음)"
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "deleted"
+msgstr "삭제된"
+
+msgid "not deleted"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "좌표:"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr "(없음)"
-
-msgid "deleted"
-msgstr "삭제된"
-
-msgid "not deleted"
-msgstr ""
-
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5533,12 +5539,6 @@ msgstr "키"
 msgid "Value"
 msgstr "값"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -9904,10 +9904,10 @@ msgid "Save Access Token in preferences"
 msgstr ""
 
 msgid "Access Token Key:"
-msgstr "접근 토큰 키:"
+msgstr "액세스 토큰 키:"
 
 msgid "Access Token Secret:"
-msgstr "접근 토큰 시크릿:"
+msgstr "액세스 토큰 시크릿:"
 
 msgid ""
 "<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
@@ -9927,7 +9927,7 @@ msgid "Request Token URL:"
 msgstr "리퀘스트 토큰 URL:"
 
 msgid "Access Token URL:"
-msgstr "접근 토큰 URL:"
+msgstr "액세스 토큰 URL:"
 
 msgid "Authorize URL:"
 msgstr ""
@@ -10003,15 +10003,15 @@ msgid "Advanced OAuth properties"
 msgstr "고급 OAuth 속성"
 
 msgid "Accept Access Token"
-msgstr "접근 토큰 동의"
+msgstr "액세스 토큰 동의"
 
 msgid ""
 "<html>You have successfully retrieved an OAuth Access Token from the OSM "
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
-"<html>OSM 웹사이트에서 OAuth 접근 토큰을 성공적으로 검색하였습니다. 토큰에 동의하려면\r\n"
-" <strong>{0}</strong>를 클릭합니다. 이 토큰값은 JOSM이 OSM API에 대한 접근 권한을 얻기 위한 후속 요청에 "
+"<html>OSM 웹사이트에서 OAuth 액세스 토큰을 성공적으로 가져왔습니다. 토큰에 동의하려면\r\n"
+" <strong>{0}</strong>를 클릭합니다. 이 토큰값은 JOSM이 OSM API에 대한 액세스 권한을 얻기 위한 후속 요청에 "
 "사용됩니다.</html>"
 
 msgid "Authorize now"
@@ -10027,7 +10027,7 @@ msgid "Run the automatic authorization steps again"
 msgstr "자동 인증 단계 다시 실행"
 
 msgid "Test Access Token"
-msgstr "접근 토큰 테스트"
+msgstr "액세스 토큰 테스트"
 
 msgid "Please enter your OSM password"
 msgstr "OSM 비밀번호를 입력해 주세요"
@@ -10036,15 +10036,15 @@ msgid "The password cannot be empty. Please enter your OSM password"
 msgstr "비밀번호는 비워 둘 수 없습니다. OSM 비밀번호를 입력해 주세요"
 
 msgid "Authorize JOSM to access the OSM API"
-msgstr "OSM API에 접근하기 위한 JOSM 인증"
+msgstr "OSM API에 액세스하기 위한 JOSM 인증"
 
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
 "OSM server failed.<br><br>Please try again or choose another kind of "
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>OSM 서버에서 OAuth 접근 토큰을 검색하는 자동 프로세스가 실패하였습니다.<br><br>다시 시도하거나 다른 종류의 인증 "
-"프로세스를 선택하세요.<br>(반자동 또는 수동 인증)</html>"
+"<html>OSM 서버에서 OAuth 액세스 토큰을 가져오는 자동 프로세스가 실패하였습니다.<br><br>다시 시도하거나 다른 종류의 "
+"인증 프로세스를 선택하세요.<br>(반자동 또는 수동 인증)</html>"
 
 msgid "OAuth authorization failed"
 msgstr "OAuth 인증 실패"
@@ -10065,16 +10065,16 @@ msgstr ""
 msgid ""
 "Please enter an OAuth Access Token which is authorized to access the OSM "
 "server ''{0}''."
-msgstr "OSM 서버 ''{0}''에 접근할 수 있는 권한이 부여된 OAuth 접근 토큰을 입력해 주세요."
+msgstr "OSM 서버 ''{0}''에 액세스할 수 있는 권한이 부여된 OAuth 액세스 토큰을 입력해 주세요."
 
 msgid "Access Token"
-msgstr "접근 토큰"
+msgstr "액세스 토큰"
 
 msgid "Advanced OAuth parameters"
 msgstr "고급 OAuth 매개변수"
 
 msgid "Enter the OAuth Access Token"
-msgstr "OAuth 접근 토큰 입력"
+msgstr "OAuth 액세스 토큰 입력"
 
 msgid "Enter advanced OAuth properties"
 msgstr "고급 OAuth 속성 입력"
@@ -10083,26 +10083,26 @@ msgid ""
 "<html><body>Please enter an OAuth Access Token which is authorized to access "
 "the OSM server ''{0}''.</body></html>"
 msgstr ""
-"<html><body>OSM 서버 ''{0}''에 접근할 수 있는 권한이 부여된 OAuth 접근 토큰을 입력해 "
+"<html><body>OSM 서버 ''{0}''에 액세스할 수 있는 권한이 부여된 OAuth 액세스 토큰을 입력해 "
 "주세요.</body></html>"
 
 msgid "Please enter an Access Token Key"
-msgstr "접근 토큰 키를 입력해 주세요"
+msgstr "액세스 토큰 키를 입력해 주세요"
 
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr "접근 토큰 키는 비워 둘 수 없습니다. 접근 토큰 키를 입력해 주세요"
+msgstr "액세스 토큰 키는 비워 둘 수 없습니다. 액세스 토큰 키를 입력해 주세요"
 
 msgid "Please enter an Access Token Secret"
-msgstr "접근 토큰 시크릿을 입력해 주세요"
+msgstr "액세스 토큰 시크릿을 입력해 주세요"
 
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
 "Secret"
-msgstr "접근 토큰 시크릿은 비워 둘 수 없습니다. 접근 토큰 시크릿을 입력해 주세요"
+msgstr "액세스 토큰 시크릿은 비워 둘 수 없습니다. 액세스 토큰 시크릿을 입력해 주세요"
 
 msgid "Click to test the Access Token"
-msgstr "접근 토큰을 테스트하려면 클릭"
+msgstr "액세스 토큰을 테스트하려면 클릭"
 
 msgid ""
 "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
@@ -10124,13 +10124,10 @@ msgid "Get an Access Token for ''{0}''"
 msgstr ""
 
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "인증을 취소하고 대화 상자 닫기"
 
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
-
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
+msgstr "액세스 토큰을 동의하고 대화 상자 닫기"
 
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
@@ -10164,16 +10161,16 @@ msgid "Logging out session ''{0}''..."
 msgstr ""
 
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "지도 데이터 업로드 허용"
 
 msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr ""
+msgstr "선택하면 지도 데이터를 업로드할 권한을 부여합니다"
 
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "GPS 추적 업로드 허용"
 
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr ""
+msgstr "선택하면 GPS 추적을 업로드할 권한을 부여합니다"
 
 msgid "Allow to download your private GPS traces"
 msgstr ""
@@ -10184,34 +10181,34 @@ msgid ""
 msgstr ""
 
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "환경 설정 읽기 허용"
 
 msgid "Select to grant JOSM the right to read your server preferences"
-msgstr ""
+msgstr "선택하면 서버 환경 설정 읽기 권한을 부여합니다"
 
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "환경 설정 쓰기 허용"
 
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
+msgstr "선택하면 서버 환경 설정 쓰기 권한을 부여합니다"
 
 msgid "Allow modifications of notes"
-msgstr ""
+msgstr "참고 수정 허용"
 
 msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr ""
+msgstr "선택하면 참고를 수정할 권한을 부여합니다"
 
 msgid "Retrieving OAuth Access Token..."
-msgstr ""
+msgstr "OAuth 액세스 토큰 가져오는 중..."
 
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
 
 msgid "Request Failed"
-msgstr ""
+msgstr "요청 실패"
 
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "OAuth 요청 토큰 가져오는 중..."
 
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
@@ -10220,21 +10217,22 @@ msgid "Display Advanced OAuth Parameters"
 msgstr "고급 OAuth 변수 표시"
 
 msgid "Retrieve Request Token"
-msgstr ""
+msgstr "요청 토큰 가져오기"
 
 msgid ""
 "<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
 "Token from ''{1}''.</html>"
 msgstr ""
+"<html>''{1}''에서 OAuth 요청 토큰을 가져오려면 <strong>{0}</strong>를 클릭해 주세요.</html>"
 
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+msgstr "<html>단계 1/3: OAuth 요청 토큰 가져오기</html>"
 
 msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr ""
+msgstr "<html>단계 2/3: 인증 및 액세스 토큰 가져오기</html>"
 
 msgid "Request Access Token"
-msgstr ""
+msgstr "액세스 토큰 요청"
 
 msgid ""
 "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
@@ -10247,10 +10245,10 @@ msgid ""
 msgstr ""
 
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "단계 1/3로 돌아가기"
 
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr ""
+msgstr "<html>단계 3/3: 액세스 토큰을 성공적으로 가져옴</html>"
 
 msgid ""
 "<html>JOSM has successfully retrieved an Access Token. You can now accept "
@@ -10259,16 +10257,16 @@ msgid ""
 msgstr ""
 
 msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "요청 토큰을 가져오려면 클릭"
 
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "액세스 토큰 가져오기"
 
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "액세스 토큰을 가져오려면 클릭"
 
 msgid "Testing OAuth Access Token"
-msgstr ""
+msgstr "OAuth 액세스 토큰 테스트 중"
 
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
@@ -10281,9 +10279,11 @@ msgid ""
 "at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
 "''{3}''.</html>"
 msgstr ""
+"<html>액세스 토큰 ''{0}''을 사용해<br>OSM 서버 ''{1}''에 성공적으로 액세스했습니다.<br>id ''{3}''인 "
+"사용자 ''{2}''로 OSM 서버에 액세스하고 있습니다.</html>"
 
 msgid "Success"
-msgstr ""
+msgstr "성공"
 
 msgid ""
 "<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
@@ -10293,7 +10293,7 @@ msgid ""
 msgstr ""
 
 msgid "Test failed"
-msgstr ""
+msgstr "테스트 실패"
 
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
@@ -10325,25 +10325,25 @@ msgid ""
 msgstr ""
 
 msgid "Retrieving user info..."
-msgstr ""
+msgstr "사용자 정보 가져오는 중..."
 
 msgid "Expert mode"
-msgstr ""
+msgstr "전문가 모드"
 
 msgid "Close the preferences dialog and discard preference updates"
-msgstr ""
+msgstr "환경 설정 업데이트를 취소하고 대화 상자 닫기"
 
 msgid "Save the preferences and close the dialog"
-msgstr ""
+msgstr "환경 설정을 저장하고 대화 상자 닫기"
 
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr ""
+msgstr "일부 설정을 적용하려면 JOSM을 다시 시작해야 합니다."
 
 msgid "Would you like to restart now?"
-msgstr ""
+msgstr "지금 다시 시작하시겠습니까?"
 
 msgid "Download plugins"
-msgstr ""
+msgstr "플러그인 다운로드"
 
 msgid "Icon paths:"
 msgstr ""
@@ -11828,7 +11828,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13103,7 +13103,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14222,9 +14227,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr "오래된 Java 버전"
 
@@ -14234,9 +14236,6 @@ msgstr "Java 업데이트"
 msgid "You are running version {0} of Java."
 msgstr "Java의 버전 {0}를 실행하고 있습니다."
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14247,9 +14246,17 @@ msgid ""
 "update to Java {0}."
 msgstr "JOSM은 이 버전으로 작동을 곧 멈출 것입니다; Java {0}으로 업데이트할 것을 적극 권장합니다."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14832,6 +14839,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14859,6 +14872,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14889,6 +14905,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14937,21 +14956,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14993,15 +15023,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15017,6 +15062,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15122,9 +15173,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15134,6 +15191,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15218,9 +15278,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15236,31 +15323,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15279,13 +15395,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15294,21 +15410,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15327,6 +15453,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15339,6 +15468,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15466,16 +15598,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15508,15 +15645,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15528,15 +15675,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15597,18 +15760,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15672,18 +15854,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15717,26 +15910,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15746,15 +15948,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15762,6 +15978,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15900,23 +16119,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15943,18 +16174,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15988,6 +16235,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16066,12 +16316,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16127,8 +16385,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16152,345 +16410,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23080,6 +23724,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25325,6 +25972,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26297,6 +26947,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27149,6 +27802,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27158,6 +27834,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31695,24 +32374,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "relation ''{2}''의 위치 {1}에 있는 node ''{0}'' 제거"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "relation ''{2}''의 위치 {1}에 있는 way ''{0}'' 제거"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "relation ''{2}''의 위치 {1}에 있는 relation ''{0}'' 제거"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ku.po b/i18n/po/ku.po
index 57b9ffb..2e97e34 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-01-31 19:32+0000\n"
 "Last-Translator: Rokar ✌ <Unknown>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:55+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:56+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 1ce09ea..1c4d162 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2012-12-18 02:36+0000\n"
 "Last-Translator: SimpleLeon <Unknown>\n"
 "Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:54+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:55+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index 1020318..6184633 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-04-28 18:56+0000\n"
 "Last-Translator: Charel <ceilenbecker at gmail.com>\n"
 "Language-Team: Luxembourgish <lb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:57+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:58+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 0541759..ef3b450 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-09-15 10:06+0000\n"
 "Last-Translator: Anousone <Unknown>\n"
 "Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:56+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:57+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 549ce8c..643f07e 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-30 11:41+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-20 09:44+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:57+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:58+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: lt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5822,6 +5822,25 @@ msgstr[0] "Jų versija ({0} įrašas)"
 msgstr[1] "Jų versija ({0} įrašai)"
 msgstr[2] "Jų versija ({0} įrašų)"
 
+msgid "My version (local dataset)"
+msgstr "Mano versija (vietinė duomenų aibė)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Mano duomenų aibės savybės, t. y., vietinės duomenų aibės"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Sulieto elemento savybės. Jos pakeis savybes mano elemente, kai bus "
+"pritaikyti suliejimo sprendimai."
+
+msgid "Their version (server dataset)"
+msgstr "Jų versija (serverio duomenų aibė)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Jų duomenų aibės savybės, t.y. serverio duomenų aibės"
+
 msgid "My with Their"
 msgstr "Mano su jų"
 
@@ -5910,28 +5929,6 @@ msgstr "Taškas"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Sulieti taškai dar neužšaldyti. Negalima sukurti sprendimo komandos."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Mano duomenų aibės savybės, t. y., vietinės duomenų aibės"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Sulieto elemento savybės. Jos pakeis savybes mano elemente, kai bus "
-"pritaikyti suliejimo sprendimai."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Jų duomenų aibės savybės, t.y. serverio duomenų aibės"
-
-msgid "Coordinates:"
-msgstr "Koordinatės:"
-
-msgid "Deleted State:"
-msgstr "Pašalinta būsena:"
-
-msgid "Referenced by:"
-msgstr "Priklauso:"
-
 msgid "(none)"
 msgstr "(nėra)"
 
@@ -5941,6 +5938,15 @@ msgstr "ištrintas"
 msgid "not deleted"
 msgstr "ne ištrintas"
 
+msgid "Deleted State:"
+msgstr "Pašalinta būsena:"
+
+msgid "Coordinates:"
+msgstr "Koordinatės:"
+
+msgid "Referenced by:"
+msgstr "Priklauso:"
+
 msgid "Keep my coordinates"
 msgstr "Palikti mano koordinates"
 
@@ -5986,12 +5992,6 @@ msgstr "Raktas"
 msgid "Value"
 msgstr "Reikšmė"
 
-msgid "My version (local dataset)"
-msgstr "Mano versija (vietinė duomenų aibė)"
-
-msgid "Their version (server dataset)"
-msgstr "Jų versija (serverio duomenų aibė)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Palikti pažymėtą rakto/reikšmės porą iš vietinės duomenų aibės"
 
@@ -9864,16 +9864,16 @@ msgstr[1] "{0} objektai šalinimui:"
 msgstr[2] "{0} objektų šalinimui:"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Savosios projekcijos"
 
 msgid "Offset"
 msgstr "Poslinkis"
 
 msgid "Tile download projection"
-msgstr ""
+msgstr "Kaladėlių atsiuntimo projekcija"
 
 msgid "Tile display projection"
-msgstr ""
+msgstr "Kaladėlių rodymo projekcija"
 
 msgid "Current zoom"
 msgstr ""
@@ -9897,7 +9897,7 @@ msgid "Tile display size"
 msgstr ""
 
 msgid "Reprojection"
-msgstr ""
+msgstr "Perprojektavimas"
 
 msgid "Reprojected tile size"
 msgstr ""
@@ -10163,9 +10163,11 @@ msgid ""
 "Reprojecting layer {0} from {1} to {2}. For best image quality and "
 "performance, switch to one of the supported projections: {3}"
 msgstr ""
+"Perprojektuojamas sluoksnis {0} iš {1} į {2}. Geriausiai vaizdo kokybei ir "
+"našumui perjunkite į vieną iš palaikomų projekcijų: {3}"
 
 msgid "Unable to find supported projection for layer {0}. Using {1}."
-msgstr ""
+msgstr "Nepavyko rasti palaikomos projekcijos sluoksniui {0}. Naudojama {1}."
 
 msgid "Correlate to GPX"
 msgstr "Koreliuoti su GPX"
@@ -11075,9 +11077,6 @@ msgstr "Uždarykite langą ir atšaukite autorizaciją"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Užverti dialogo langą ir priimti prieigos raktą"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Nepavyko nutraukti vykdomos OAuth operacijos"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Gaunama OAuth prieigos rakto užklausa iš „{0}“"
 
@@ -12917,8 +12916,8 @@ msgstr "PUWG Zona"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Šveicarija)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (be vietinių patikslinimų)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Gvadelupės Fort-Marigot 1949"
@@ -14293,7 +14292,12 @@ msgstr "Skaitymo atsisakyta"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -15615,9 +15619,6 @@ msgstr "Atidaromas URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL neturi {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "rezervuota"
-
 msgid "Outdated Java version"
 msgstr "Pasenusi Java versija"
 
@@ -15627,9 +15628,6 @@ msgstr "Atnaujinkite Java"
 msgid "You are running version {0} of Java."
 msgstr "Naudojate Java {0} versiją."
 
-msgid "April 2015"
-msgstr "2015 m. balandis"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15643,9 +15641,17 @@ msgstr ""
 "JOSM greitai nustos veikti su šia Java versija; mes labai rekomenduojame "
 "atnaujinti į Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Ar norite atnaujinti dabar?"
 
+msgid "reserved"
+msgstr "rezervuota"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16261,6 +16267,12 @@ msgstr "HDM (Humanitarinė OpenStreetMap komanda)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox palydovinis"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap (pritaikyta dviračiams)"
 
@@ -16288,6 +16300,9 @@ msgstr "OpenStreetMap (Vokiško stiliaus)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS trasos"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Viešasis transportas (ÖPNV)"
 
@@ -16318,6 +16333,9 @@ msgstr "Strava dviračių ir bėgimo intensyvumo žemėlapis"
 msgid "Locator Overlay"
 msgstr "Locator perdanga"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -16366,21 +16384,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16422,15 +16451,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16446,6 +16490,12 @@ msgstr "Tiris: DOM (Paviršiaus modelis)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (pagrindinės paskirties)"
 
@@ -16551,9 +16601,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16563,6 +16619,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16647,9 +16706,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase hidrografija"
 
@@ -16665,31 +16751,60 @@ msgstr "British Columbia Mosaic (Britų Kolumbija)"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna kelių perdanga"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Čekų CUZK:KM"
 
@@ -16708,13 +16823,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Danija)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16723,21 +16838,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danija)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danija)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estijos bazinis žemėlapis (Maaamet)"
 
@@ -16756,6 +16881,9 @@ msgstr "Estijos miškai (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16768,6 +16896,9 @@ msgstr "Bordo, Prancūzija - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -16899,16 +17030,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16941,15 +17077,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16961,15 +17107,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Dronų nuotraukos (Haitis)"
 
@@ -17030,18 +17192,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -17105,18 +17286,29 @@ msgstr "Pietų Tirolio ortoforo 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "Pietų Tirolio topožemėlapis"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "Sovietinis - Latvija"
 
@@ -17150,26 +17342,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Nigerio delta - 2012 m. spalis - Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gazos ruožas - Pléiades - 2014/07/06"
 
@@ -17179,15 +17380,29 @@ msgstr "Gazos ruožas - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17195,6 +17410,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17333,23 +17551,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17376,18 +17606,34 @@ msgstr "RABA-KGZ: Slovėnijos užstatytos teritorijos"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Pietų Afrika CD:NGI oro nuotraukos"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17421,6 +17667,9 @@ msgstr "GRAFCAN Express - Kanarų salos"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Argau kantonas 25cm (AGIS 2011)"
 
@@ -17499,12 +17748,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17560,8 +17817,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17636,9 +17893,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17690,240 +17958,615 @@ msgstr "NLS - Bartolomėjaus pusė coliaus, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS miesto planai, Aberdynas 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS miesto planai, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS miesto planai, Aleksandrija 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS miesto planai, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS miesto planai, Ananas 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS mieto planai, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS miesto planai, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS miesto planai, Bervikas prie Tvydo 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS miesto planai, Brečinas 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS miesto planai, Burntislandas 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS miesto planai, Kampbeltonas 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS miesto planai, Kotbridžas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS miesto planai, Kuparas 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS miesto planai, Kuparas 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS miesto planai, Dalkeitas 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS miesto planai, Dalkeitas 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS miesto planai, Dumbartonas 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS miesto planai, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS miesto planai, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS miesto planai, Dundis 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS miesto planai, Dundis 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS miesto planai, Dunfermlainas 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS miesto planai, Dunfermlainas 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS miesto planai, Edinburgas 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS miesto planai, Edinburgas 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS miesto planai,  Edinburgas 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS miesto planai, Elginas 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS miesto planai, Falkirkas 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS miesto planai, Forfaras 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS miesto planai, Foresas 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS miesto planai, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS miesto planai, Girvanas 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS miesto planai, Glazgas 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS miesto planai, Glazgas 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS miesto planai, Grynokas 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS miesto planai, Hadingtonas 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS miesto planai, Hadingtonas 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS miesto planai, Hamiltonas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS miesto planai, Havikas 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS miesto planai, Invernesas 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS miesto planai, Irvinas 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS miesto planai, Jedburgas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS miesto planai, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS miesto planai, Kilmarnokas 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS miesto planai, Kirkkaldis 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS miesto planai, Kirkkaldis 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS miesto planai, Kirkkudbraitas 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS miesto planai, Kirkkudbraitas 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS miesto planai,, Kirkintillochas 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS miesto planai, Kirriemuiras 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS miesto planai, Lanarkas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS miesto planai, Linlithgavas 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS miesto planai, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS miesto planai, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS miesto planai, Muselburgas 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS miesto planai, Muselburgas 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS miesto planai, Nairnas 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS miesto planai, Obanas 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS miesto planai, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS miesto planai,  Pertas 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS miesto planai, Peterhedas 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS miesto planai,  Glazgo uostas 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS miesto planai, Portabelas 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS miesto planai, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS miesto planai, Selkirkas 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS miesto planai, Šv. Andriaus 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS miesto planai, Šv. Andriaus 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS miesto planai, Stirlingas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS miesto planai, Stonehavenas 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS miesto planai, Stranraeras 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS miesto planai, Stranraeras 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS miesto planai, Stranraeras 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS miesto planai, Strathavenas 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS miesto planai, Vikas 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS miesto planai, Vigtaunas 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS miesto planai, Vigtaunas 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24451,10 +25094,10 @@ msgid "Palaeontological Site"
 msgstr "Paleontologijos vieta"
 
 msgid "Monument"
-msgstr ""
+msgstr "Monumentas"
 
 msgid "Memorial"
-msgstr ""
+msgstr "Memorialas"
 
 msgctxt "memorial"
 msgid "statue"
@@ -24478,7 +25121,7 @@ msgstr "akmuo"
 
 msgctxt "memorial"
 msgid "war_memorial"
-msgstr ""
+msgstr "karo_memorialas"
 
 msgid "Inscription"
 msgstr ""
@@ -24526,6 +25169,9 @@ msgstr "Jūrų gėrybės"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25582,7 +26228,7 @@ msgid "Plant Nursery"
 msgstr "Augalų daigynas"
 
 msgid "Aquaculture"
-msgstr ""
+msgstr "Akvakultūra"
 
 msgid "shrimp"
 msgstr ""
@@ -26447,7 +27093,7 @@ msgid "{0} together with {1}"
 msgstr "{0} kartu su {1}"
 
 msgid "suspicious tag combination"
-msgstr ""
+msgstr "įtartina žymų kombinacija"
 
 msgid "two objects, one with {0} and one with {1} + {2} + {3}"
 msgstr ""
@@ -26462,7 +27108,7 @@ msgid "{0} together with addr:*"
 msgstr "{0} kartu su addr:*"
 
 msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} kartu su {1} ir prieštaringomis reikšmėmis"
 
 msgid "{0} on suspicious object"
 msgstr "{0} ant įtartino objekto"
@@ -26483,7 +27129,7 @@ msgid "Same value of {0}, {1} and {2}"
 msgstr ""
 
 msgid "{0} and {1} together with {2} and conflicting values"
-msgstr ""
+msgstr "{0} ir {1} kartu su {2} ir prieštaringomis reikšmėmis"
 
 msgid "{0} on a relation without {1}"
 msgstr "{0} ant ryšio be {1}"
@@ -26501,7 +27147,7 @@ msgid ""
 msgstr ""
 
 msgid "{0} together with {1} and {2}. Remove {1} and {2}"
-msgstr ""
+msgstr "{0} kartu su {1} ir {2}. Pašalinkite {1} ir {2}"
 
 msgid "Different number of lanes in the keys {0} and {1}"
 msgstr ""
@@ -26542,6 +27188,8 @@ msgid ""
 "{0} is unspecific. Instead use the key fixme with the information what "
 "exactly should be fixed in the value of fixme."
 msgstr ""
+"{0} yra netikslu. Vietoje to naudokite raktą fixme su informacija, ką "
+"tiksliai reikia pataisyti fixme reikšmėje."
 
 msgid "{0} is deprecated. Please use instead a multipolygon."
 msgstr "{0} yra pasenęs. Vietoje to naudokite multipoligoną."
@@ -26557,7 +27205,7 @@ msgstr ""
 "{0} pasenusi. Pašalinkite šį objektą ir vietoje jo naudokite privatų sluoksnį"
 
 msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
-msgstr ""
+msgstr "{0}={1} yra netikslu. Pakeiskite „{1}“ tikslia reikšme."
 
 msgid "{0} should be replaced with {1}"
 msgstr ""
@@ -26569,6 +27217,8 @@ msgid ""
 "{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
 "''both''."
 msgstr ""
+"{0}={1} yra netikslu. Pakeiskite „{1}“ į „left“ (kairė), „right“ (dešinė) "
+"arba „both“ (abi)."
 
 msgid "Unspecific tag {0}"
 msgstr ""
@@ -26629,7 +27279,7 @@ msgid "{0} on a way. Should be used in a relation"
 msgstr ""
 
 msgid "{0} together with {1} on a node. Remove {0}."
-msgstr ""
+msgstr "{0} kartu su {1} ant taško. Pašalinkite {0}."
 
 msgid "{0} on a node"
 msgstr ""
@@ -26788,6 +27438,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26878,6 +27531,8 @@ msgid ""
 "wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
 "wikipedia=language:value together with wikidata tag."
 msgstr ""
+"žyma wikipedia nenustatyta, bet žyma „{0}“ yra. Naudokite "
+"wikipedia=kalba:reikšmė kartu su žyma wikidata ."
 
 msgid "Hide icons at low zoom"
 msgstr "Slėpti piktogramas mažai priartinus"
@@ -27446,10 +28101,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 msgid "Default image projection"
-msgstr ""
+msgstr "Numatytoji vaizdo projekcija"
 
 msgid "JOSM''s current projection"
-msgstr ""
+msgstr "JOSM dabartinė projekcija"
 
 msgid ""
 "No projection file (.prj) found.<br>You can choose the default image "
@@ -27457,6 +28112,10 @@ msgid ""
 "image projection.<br>(It can be changed later from the right click menu of "
 "the image layer.)"
 msgstr ""
+"Projekcijos failas (.prj) nerastas.<br>Galite pasirinkti numatytąją "
+"projekciją ({0}) arba JOSM dabartinę rengyklės projekciją ({1}) kaip "
+"originalią vaizdo projekciją.<br>(Ji gali būti pakeista vėliau iš vaizdų "
+"sluoksnio kontekstinio meniu.)"
 
 msgid "Layer Properties"
 msgstr ""
@@ -27768,6 +28427,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28632,6 +29294,29 @@ msgstr "Derinimas"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Derinimo veiksena įrašys vaizdus kiekvienam apdorojimo žingsniui."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28641,6 +29326,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -28844,7 +29532,7 @@ msgid ""
 msgstr ""
 
 msgid "Change the current projection"
-msgstr ""
+msgstr "Pakeisti dabartinę projekciją"
 
 msgid "Replace original background by JOSM background color."
 msgstr ""
@@ -29142,11 +29830,13 @@ msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
 msgid "{0} not allowed with the current projection"
-msgstr ""
+msgstr "{0} neleidžiama su dabartine projekcija"
 
 msgid ""
 "Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
+"Nepavyko įkelti podėlio {0}, kuris yra nesuderinamas su dabartine "
+"projekcijos zona"
 
 msgid ""
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
@@ -31959,7 +32649,7 @@ msgid "Bind to coordinates"
 msgstr ""
 
 msgid "Projection:"
-msgstr ""
+msgstr "Projekcija:"
 
 msgid "Bottom left (min) corner:"
 msgstr ""
@@ -31974,13 +32664,13 @@ msgid "Top right (max) corner:"
 msgstr ""
 
 msgid "Projection Preferences"
-msgstr ""
+msgstr "Projekcijos nuostatos"
 
 msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "Užverti dialogo langą ir pritaikyti projekcijos nuostatas"
 
 msgid "Close the dialog, discard projection preference changes"
-msgstr "Užverti dialogo langą, atmesti projekcijos nuostatos pakeitimus"
+msgstr "Užverti dialogo langą, atmesti projekcijos nuostatų pakeitimus"
 
 msgid "Loading..."
 msgstr "Įkeliama..."
@@ -32046,7 +32736,7 @@ msgid "Finalizing layers"
 msgstr ""
 
 msgid "Please set a projection."
-msgstr ""
+msgstr "Nustatykite projekciją."
 
 msgid "Could not parse numbers. Please check."
 msgstr ""
@@ -33233,24 +33923,6 @@ msgstr "Ženklas {0}"
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr "maršruto parinkimo aktyvus maršrutas"
 
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 46a1903..bc4be32 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2012-10-03 22:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:56+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:57+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: lv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5401,6 +5401,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5483,33 +5500,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5557,12 +5563,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10126,9 +10126,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11825,7 +11822,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13098,7 +13095,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14215,9 +14217,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14227,9 +14226,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14240,9 +14236,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14825,6 +14829,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14852,6 +14862,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14882,6 +14895,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14930,21 +14946,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14986,15 +15013,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15010,6 +15052,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15115,9 +15163,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15127,6 +15181,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15211,9 +15268,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15229,31 +15313,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15272,13 +15385,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15287,21 +15400,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15320,6 +15443,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15332,6 +15458,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15459,16 +15588,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15501,15 +15635,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15521,15 +15665,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15590,18 +15750,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15665,18 +15844,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15710,26 +15900,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15739,15 +15938,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15755,6 +15968,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15893,23 +16109,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15936,18 +16164,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15981,6 +16225,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16059,12 +16306,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16120,8 +16375,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16145,345 +16400,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23069,6 +23710,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25314,6 +25958,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26286,6 +26933,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27138,6 +27788,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27147,6 +27820,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31684,24 +32360,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index db8fb69..725df30 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2013-05-11 04:37+0000\n"
 "Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
 "Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:58+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:59+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: mk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5394,6 +5394,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5476,33 +5493,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5550,12 +5556,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10119,9 +10119,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11819,7 +11816,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13088,7 +13085,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14205,9 +14207,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14217,9 +14216,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14230,9 +14226,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14815,6 +14819,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14842,6 +14852,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14872,6 +14885,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14920,21 +14936,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14976,15 +15003,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15000,6 +15042,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15105,9 +15153,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15117,6 +15171,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15201,9 +15258,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15219,31 +15303,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15262,13 +15375,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15277,21 +15390,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15310,6 +15433,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15322,6 +15448,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15449,16 +15578,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15491,15 +15625,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15511,15 +15655,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15580,18 +15740,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15655,18 +15834,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15700,26 +15890,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15729,15 +15928,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15745,6 +15958,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15883,23 +16099,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15926,18 +16154,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15971,6 +16215,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16049,12 +16296,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16110,8 +16365,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16135,345 +16390,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23059,6 +23700,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25304,6 +25948,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26276,6 +26923,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27128,6 +27778,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27137,6 +27810,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31674,24 +32350,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index b6f77fa..d9e1c85 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-05-24 23:45+0000\n"
 "Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
 "Language-Team: Marathi <mr at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:58+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:59+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: mr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5419,6 +5419,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "त्यांची आवृत्ती ({0} नोंद)"
 msgstr[1] "त्यांची आवृत्ती ({0} नोंदी)"
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr "माझी त्यांच्याबरोबर"
 
@@ -5501,33 +5518,22 @@ msgstr "गाठ"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
+msgid "(none)"
 msgstr ""
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "deleted"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "not deleted"
 msgstr ""
 
-msgid "Coordinates:"
-msgstr "सहनिर्देशक:"
-
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
-msgstr ""
+msgid "Coordinates:"
+msgstr "सहनिर्देशक:"
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5575,12 +5581,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10154,9 +10154,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11854,7 +11851,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13123,7 +13120,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14240,9 +14242,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14252,9 +14251,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14265,9 +14261,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14850,6 +14854,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14877,6 +14887,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14907,6 +14920,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14955,21 +14971,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15011,15 +15038,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15035,6 +15077,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15140,9 +15188,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15152,6 +15206,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15236,9 +15293,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15254,31 +15338,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15297,13 +15410,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15312,21 +15425,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15345,6 +15468,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15357,6 +15483,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15484,16 +15613,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15526,15 +15660,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15546,15 +15690,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15615,18 +15775,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15690,18 +15869,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15735,26 +15925,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15764,15 +15963,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15780,6 +15993,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15918,23 +16134,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15961,18 +16189,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16006,6 +16250,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16084,12 +16331,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16145,8 +16400,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16170,345 +16425,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23094,6 +23735,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25339,6 +25983,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26311,6 +26958,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27163,6 +27813,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27172,6 +27845,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31709,24 +32385,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 80fe8eb..3c96a22 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-12-11 22:14+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:59+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:00+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ms\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index af409f8..989dc12 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-21 09:17+0000\n"
 "Last-Translator: Syver Stensholt <sssandum at gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:00+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:02+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: nb\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5511,6 +5511,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Tjenerens versjon ({0} oppføring)"
 msgstr[1] "Tjenerens versjon ({0} oppføringer)"
 
+msgid "My version (local dataset)"
+msgstr "Lokalt datasett"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Egenskaper i det lokate datasettet"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Egenskaper i det sammenslåtte elementet. De vil erstatte egenskaper i lokale "
+"elementer når sammenslåingsvalgene tas i bruk."
+
+msgid "Their version (server dataset)"
+msgstr "Tjenerens datasett"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Egenskaper i tjenerens datasett"
+
 msgid "My with Their"
 msgstr "Lokal med tjeners"
 
@@ -5598,28 +5617,6 @@ msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Egenskaper i det lokate datasettet"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Egenskaper i det sammenslåtte elementet. De vil erstatte egenskaper i lokale "
-"elementer når sammenslåingsvalgene tas i bruk."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Egenskaper i tjenerens datasett"
-
-msgid "Coordinates:"
-msgstr "Koordinater:"
-
-msgid "Deleted State:"
-msgstr "Slettestatus:"
-
-msgid "Referenced by:"
-msgstr ""
-
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -5629,6 +5626,15 @@ msgstr "slettet"
 msgid "not deleted"
 msgstr "ikke slettet"
 
+msgid "Deleted State:"
+msgstr "Slettestatus:"
+
+msgid "Coordinates:"
+msgstr "Koordinater:"
+
+msgid "Referenced by:"
+msgstr ""
+
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5674,12 +5680,6 @@ msgstr "Nøkkel"
 msgid "Value"
 msgstr "Verdi"
 
-msgid "My version (local dataset)"
-msgstr "Lokalt datasett"
-
-msgid "Their version (server dataset)"
-msgstr "Tjenerens datasett"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet"
 
@@ -10295,9 +10295,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12016,7 +12013,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveits)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13303,7 +13300,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14427,9 +14429,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14439,9 +14438,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14452,9 +14448,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15041,6 +15045,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15068,6 +15078,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15098,6 +15111,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15146,21 +15162,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15202,15 +15229,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15226,6 +15268,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15331,9 +15379,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15343,6 +15397,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15427,9 +15484,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15445,31 +15529,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15488,13 +15601,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15503,21 +15616,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15536,6 +15659,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15548,6 +15674,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Matrikkel"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15675,16 +15804,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15717,15 +15851,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15737,15 +15881,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15806,18 +15966,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15881,18 +16060,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15926,26 +16116,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15955,15 +16154,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15971,6 +16184,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16109,23 +16325,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16152,18 +16380,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16197,6 +16441,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16275,12 +16522,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16336,8 +16591,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16361,345 +16616,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23300,6 +23941,9 @@ msgstr "Sjømat"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delkatesser"
 
@@ -25555,6 +26199,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26529,6 +27176,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importer"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27381,6 +28031,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27390,6 +28063,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31962,24 +32638,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Rediger relasjon"
-
-msgid "Edit relations"
-msgstr "Rediger relasjoner"
-
-msgid "No relation is selected"
-msgstr "Ingen relasjoner er valgt"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index b312a32..2f5f769 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-11-29 09:01+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:59+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:00+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index f3a74d5..1601eec 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-28 06:42+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-17 06:35+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:42+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:43+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: nl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5899,6 +5899,26 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Hun versie ({0} items)"
 msgstr[1] "Hun versie ({0} items)"
 
+msgid "My version (local dataset)"
+msgstr "Mijn versie (lokale gegevensset)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Eigenschappen in mijn gegevensset, d.i. de lokale gegevensset"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Eigenschappen in het samengevoegde element. Zij zullen de eigenschappen in "
+"mijn elementen vervangen als de beslissingen om samen te voegen worden "
+"toegepast."
+
+msgid "Their version (server dataset)"
+msgstr "Hun versie (gegevensset op server)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Eigenschappen in hun gegevensset, d.i. de gegevensset op de server"
+
 msgid "My with Their"
 msgstr "Mijn met Hun"
 
@@ -5987,29 +6007,6 @@ msgstr ""
 "Samengevoegde knopen zijn nog niet vastgezet. Kan nog geen opdracht voor "
 "oplossing bouwen."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Eigenschappen in mijn gegevensset, d.i. de lokale gegevensset"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Eigenschappen in het samengevoegde element. Zij zullen de eigenschappen in "
-"mijn elementen vervangen als de beslissingen om samen te voegen worden "
-"toegepast."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Eigenschappen in hun gegevensset, d.i. de gegevensset op de server"
-
-msgid "Coordinates:"
-msgstr "Coördinaten:"
-
-msgid "Deleted State:"
-msgstr "Status van verwijdering:"
-
-msgid "Referenced by:"
-msgstr "Hier wordt naar verwezen door:"
-
 msgid "(none)"
 msgstr "(geen)"
 
@@ -6019,6 +6016,15 @@ msgstr "verwijderd"
 msgid "not deleted"
 msgstr "niet verwijderd"
 
+msgid "Deleted State:"
+msgstr "Status van verwijdering:"
+
+msgid "Coordinates:"
+msgstr "Coördinaten:"
+
+msgid "Referenced by:"
+msgstr "Hier wordt naar verwezen door:"
+
 msgid "Keep my coordinates"
 msgstr "Behoud mijn coördinaten"
 
@@ -6067,12 +6073,6 @@ msgstr "Sleutel"
 msgid "Value"
 msgstr "Waarde"
 
-msgid "My version (local dataset)"
-msgstr "Mijn versie (lokale gegevensset)"
-
-msgid "Their version (server dataset)"
-msgstr "Hun versie (gegevensset op server)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Behoud de geselecteerde sleutel/waarde-paren uit de lokale gegevensset"
@@ -11238,9 +11238,6 @@ msgstr "Sluit het dialoogvenster en annuleer het autoriseren"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Sluit het dialoogvenster en accepteer het Toegangstoken"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Annuleren van uitgevoerde bewerking van OAuth mislukt"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Verkrijgen van Verzoektoken van OAuth vanaf ''{0}''"
 
@@ -13143,8 +13140,8 @@ msgstr "PUWG-zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Zwitsers raster (Zwitserland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (zonder lokale correcties)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13855,7 +13852,7 @@ msgid "Unknown requisite: {0}"
 msgstr "Onbekend vereiste: {0}"
 
 msgid "Unknown regexp value: {0}"
-msgstr ""
+msgstr "Onbekende waarde regexp: {0}"
 
 msgid "Illegal member expression: {0}"
 msgstr "Ongeldige uitdrukking voor lid: {0}"
@@ -14570,10 +14567,17 @@ msgstr "Lezen werd geannuleerd"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
 msgstr ""
 "Ontbrekende verplichte attributen voor element ''bounds''. Kreeg "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
+msgstr ""
+"Ongeldige waarde voor attributen ''lat'', ''lon'' op knoop met ID {0}. Kreeg "
+"''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Verwijderde weg {0} bevat knopen"
@@ -15928,9 +15932,6 @@ msgstr "Openings-URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL bevat geen {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "gereserveerd"
-
 msgid "Outdated Java version"
 msgstr "Verouderde Java-versie"
 
@@ -15940,9 +15941,6 @@ msgstr "Java bijwerken"
 msgid "You are running version {0} of Java."
 msgstr "U voert versie {0} van Java uit."
 
-msgid "April 2015"
-msgstr "april 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15957,9 +15955,17 @@ msgstr ""
 "JOSM zal het werken met deze versie snel beëindigen; wij adviseren u sterk "
 "om bij te werken naar Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Wilt u nu bijwerken?"
 
+msgid "reserved"
+msgstr "gereserveerd"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16597,6 +16603,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "DigitalGlobe Premium Imagery"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "DigitalGlobe Standard Imagery"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16624,6 +16636,9 @@ msgstr "OpenStreetMap (Duitse stijl)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS-sporen"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Publieke GPS-sporen, geüpload naar OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
 
@@ -16654,6 +16669,9 @@ msgstr "Strava fietsen en hardlopen heatmap"
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr "Belangrijke objecten weergeven om te helpen bij oriënteren."
+
 msgid "QA No Address"
 msgstr "QA Geen adres"
 
@@ -16702,25 +16720,41 @@ msgstr "OSM Inspector: Kustlijn (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Afbeeldingen uit de late zomer waar bronnen gewoonlijk ernstig worden "
+"beperkt door wolken en sneeuw (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+"Buiten normale bedekking van Landsat en daarom niet in LIMA en Bing/Mapbox "
+"(ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+"Vrij heldere up-to-date afbeelding voor bijwerken van randen van gletsers "
+"(ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Enderby Land en Kemp Coast"
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
-"Sentinel-2 afbeeldingen kanalen 234 (ware kleuren), Sentinel-2 afbeeldingen "
-"van Enderby Land en Kemp Coast begin 2017"
+"Sentinel-2-afbeeldingen van Enderby Land en Kemp Coast (ware kleuren)"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Argentinië (TMS)"
@@ -16761,15 +16795,34 @@ msgstr "LPI NSW Administratieve grenzen NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+"Gletsers van Northwest Heard Island (intussen in kaart gebracht) (valse "
+"kleur IR)"
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM images for mapping: Heard Island coast"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+"Recente afbeelding van Heard island met interieur meest bedekt door wolken "
+"maar met meestal wel zichtbare kust (ware kleuren)"
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Basiskaart van Oostenrijk, gebaseerd op gegevens van de overheid."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Orthofoto-laag verschaft door basemap.at. "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16785,6 +16838,12 @@ msgstr "Tiris: DOM (Oppervlaktemodel)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: contourlijnen"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: orthophoto"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: orthophoto infrarood"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Wenen: Mehrzweckkarte (algemene doeleinden)"
 
@@ -16890,9 +16949,18 @@ msgstr "Benin: Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM images for mapping: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+"Gedeeltelijk en gedeeltelijk bewolkte bedekking in normale bronnen (ware "
+"kleuren)"
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM images for mapping: Bouvet Island"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+"Voor meer nauwkeurig in kaart brengen van kustlijn en gletser (ware kleuren)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16902,6 +16970,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr "Adresseert gegevens van IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16986,9 +17057,36 @@ msgstr "Alagoas Litoral 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr "IBGE-BC250-Aglomerado Rural Isolado"
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr "IBGE-BC250-Pista de Pouso"
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr "IBGE-BC250-Rios Drenagem"
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Trecho Rodoviario"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr "IBGE-BC250-Terra Indigena"
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr "IBGE-BC250-Terra Publico (Militar)"
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr "IBGE-BC250-Unidade de Uso Sistentável - APA"
+
+msgid "IBGE-BC250-Villa"
+msgstr "IBGE-BC250-Villa"
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+
+msgid "IBGE-BCIM-Município"
+msgstr "IBGE-BCIM-Município"
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrografie"
 
@@ -17004,33 +17102,70 @@ msgstr "British Columbia Mozaïek"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Laatste zuidwestelijk British Columbia Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+"Recente lage-resolutie-afbeeldingen van Landsat voor zuidwest Brits Columbia"
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "Hoge kwalieit luchtofoto van Kelowna"
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Wegen overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr "Kustlijn ondertussen meeste in kaart gebracht (false color IR)"
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Samengesteld uit afbeeldingen van ASTER uit juli 2012 (ware kleuren met "
+"geschat blauw)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Northern Ellesmere Island "
 "July 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Samengesteld uit afbeeldingen van ASTER uit juli 2016 (ware kleuren met "
+"geschat blauw)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Afbeelding van na de uitbarsting van 2014/2015 (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM images for mapping: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+"Veel van de zeer ruwe kustlijn zou hier verbeterd kunnen worden, echter veel "
+"door sneeuw bedekt dus niet te gebruiken voor in kaart brengen van gletsjers "
+"(valse kleur IR)"
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Afbeelding van na de uitbarsting van 2015 (ware kleuren)"
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -17049,14 +17184,14 @@ msgstr "Praag IPR laatste luchtfoto’s"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Praag IPR lage-vegetatie luchtfoto"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denemarken)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -17064,23 +17199,37 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denemarken)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denemarken)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM images for mapping: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+"2007 ASTERafbeelding die betere bedekking voor gletsjers biedt dan de gewone "
+"bronnen (ware kleuren met geschat blauw)"
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Darwin and Wolf islands, "
 "Galapagos"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+"Recente afbeelding, momenteel alleen oude en slechte afbeeldingen in andere "
+"bronnen (ware kleuren)"
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -17099,6 +17248,9 @@ msgstr "Estonia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "Frans adresregister of Base Adresses Nationale"
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17111,6 +17263,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Kadaster"
 
+msgid "French land registry"
+msgstr "Frans kadaster"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17242,22 +17397,29 @@ msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+"Bijgewerkte afbeelding van laagtij van de kust voor bijwerken van in kaart "
+"brengen van droogvallende banken en ondiepten (ware kleuren)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: North Sea Coast 2016"
+"Bijgewerkte afbeelding van laagtij van de kust voor bijwerken van in kaart "
+"brengen van droogvallende banken en ondiepten (valse kleur IR)"
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
-"234 kanalen (ware kleuren), Bijgewerkte getijden afbeelding van de kust voor "
-"het bijwerken van het in kaart brengen van droogvallende plekken en platen"
+"imagico.de OSM-afbeeldingen voor in kaart brengen: North Sea Coast 2016"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Saksen laatste luchtfoto’s"
@@ -17289,9 +17451,16 @@ msgstr "München laatste luchtfoto’s 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM images for mapping: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+"Icebridge DMSafbeelding van de nederzetting - uitlijning kan slecht zijn"
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM images for mapping: Thule Air Base"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr "Icebridge DMSafbeelding - uitlijning kan slecht zijn"
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17300,6 +17469,11 @@ msgstr ""
 "altitude overflight September 2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+"Icebridge DMSluchtfoto’s van Thule Airbase - uitlijning kan slecht zijn"
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17315,17 +17489,40 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM images for mapping: Greenland mosaic"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr "Landsat - mozaiëk van Groenland (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+"Eerste beschikbare afbeelding ten noorden van de normale grens van Landsat, "
+"meest bedekt met sneeuw uit het seizoen, dus moeilijk te interpreteren (ware "
+"kleuren)"
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Landsat off-nadir July "
 "2016"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+"Laatste afbeeldingen ten noorden van de normale grens van Landsat (ware "
+"kleuren)"
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+"Samengesteld uit meest afbeeldingen van ASTER 2012, enkele afbeeldingen uit "
+"2005 voornamelijk in het boordoosten (ware kleuren met geschat blauw)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone afbeeldingen (Haiti)"
 
@@ -17386,18 +17583,41 @@ msgstr "Hillshade Hongarije"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM images for mapping: Eastern Iceland"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr "Ontbrekende eilandjes en onnauwkeurige kust (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM images for mapping: Rann of Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+"Onderscheid land/water moeilijk in kaart te brengen, gebaseerd op "
+"afbeeldingen van Bing/Mapbox (false color IR)"
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+"Ontbrekende eilanden en ruwe kustlijn vanwege bedekking door wolken in Bing, "
+"meren zouden ook wat aanvullend detail kunnen gebruiken (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr "Ontbrekend in oudere afbeeldingen van vóór 2011 (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM images for mapping: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr "Ontbrekende eilanden in OSM (ware kleuren)"
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17461,18 +17681,30 @@ msgstr "Zuid  Tirol luchtofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Zuid-Tirol luchtfoto 2011 (hoge resolutie)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+"Orthophoto van Zuid Tirol uit 2011 met 20cm resolutie (grotere valleien)"
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Zuid-Tirol luchtfoto 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Zuid Tirol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr "Topografische basiskaart van Zuid Tirol"
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japan GSI ortho Imagery"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Mount Kenya 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr "Bijgewerkte afbeelding voor in kaart brengen gletsjer (ware kleuren)"
+
 msgid "USSR - Latvia"
 msgstr "USSR - Letland"
 
@@ -17506,28 +17738,37 @@ msgstr "Luxemburg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm"
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Svalbard mozaïek"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
-msgstr ""
-"Meest Sentinel-2 2016 kanalen 234 (ware kleuren), Sentinel-2 mozaïek van "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
+msgstr "Sentinel-2-mozaiëk van Svalbard (ware kleuren)"
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de OSM images for mapping: Western Karakoram"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+"Geeft bij benadering de minimale bedekking door sneeuw weer en kan dus goed "
+"worden gebruikt voor in kaart brengen van gletsjer (ware kleuren)"
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17539,15 +17780,35 @@ msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Panama Canal - Pacific "
 "side"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+"Nieuwe sluizen met minder wolken dan in de afbeelding  van Sentinel-2 - zorg "
+"er voor de uitlijning te controleren (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM images for mapping: Panama Canal"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+"Afbeeldingen van de nieuwe sluizen (maar gedeeltelijk bewolkt) (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM images for mapping: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+"Ruwe kustlijn vanwege de wolkenbedekking in Bing/Mapbox (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM images for mapping: New Ireland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+"Veel ontbrekende eilanden in OSM (de meeste zij  ondertussen in kaart "
+"gebracht) (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Coropuna"
 
@@ -17556,8 +17817,11 @@ msgid ""
 msgstr ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr "Slechte en verouderde afbeeldingen in andere bronnen (ware kleuren)"
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
-msgstr ""
+msgstr "Pangasinán/Bulacan (Philippines HiRes)"
 
 msgid "Geoportal 2: Ortofotomapa (aerial image)"
 msgstr "Geoportal 2: Ortofotomapa (luchtfoto)"
@@ -17694,10 +17958,26 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Kerch Strait"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+"Status van de constructie van de brug in augustus 2016 (ware kleuren)"
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Pechora Sea Coast"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+"Sentinel-2-afbeelding van de Pechora Sea-kust in herfst 2016 (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Ushakov Island August 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+"Up-to-date  afbeeldingen uit de late zomer met weinig bewolking (ware "
+"kleuren)"
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
@@ -17705,19 +17985,19 @@ msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Northern and Polar Ural "
 "mountains August 2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+"Up-to-date  afbeeldingen uit de late zomer met weinig bewolking - let op: "
+"niet alle zichtbare sneeuw zijn gletsjers (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Vostochny Cosmodrome"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Pechora Sea Coast"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
-msgstr ""
-"234 kanalen (ware kleuren), Sentinel-2afbeldding van de kust van de Pechora "
-"Sea in herfst 2016"
+msgid "Recent image showing newest features (true color)"
+msgstr "Recente afbeelding die de nieuwste onjecten weergeeft (ware kleuren)"
 
 msgid "Freemap.sk Car"
 msgstr "Freemap.sk Car"
@@ -17743,18 +18023,39 @@ msgstr "RABA-KGZ: Slovenië bebouwde gebieden"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Kaapstad 2013 Luchtfoto"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+"Alleen voor OpenStreetMap. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Kaapstad 2015 luchtfoto''s"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+"Alleen voor OpenStreetMap. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Zuid-Afrika CD:NGI Luchtfoto"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+"Ontbreekt in andere afbeeldingsbronnen (ware kleuren met geschat blauw)"
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM images for mapping: Scott Island"
 
+msgid "Missing in other image sources (true color)"
+msgstr "Ontbreekt in andere afbeeldingsbronnen (ware kleuren)"
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
 
@@ -17788,6 +18089,10 @@ msgstr "GRAFCAN Express - Canarische eilanden"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Adams Bridge"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+"Aanvullend aan onvolledige bedekking in andere bronnen (ware kleuren)"
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17868,12 +18173,22 @@ msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Cental Alps in late "
 "September 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+"Up-to-date-afbeelding voor in kaart brengen van gletsjer - let op enige "
+"verse sneeuw op hogere hoogten (ware kleuren)"
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (met contourlijnen)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr "De e-map van Taiwan National Land Surveying and Mapping Center"
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan stadsgrenzen"
 
@@ -17910,6 +18225,9 @@ msgid ""
 "zooms, only changes since 2006 minus changes already incorporated into "
 "OpenStreetMap"
 msgstr ""
+"Op zoomniveau 16+, publieke domeinkaartgegevens van US Census. Op lagere "
+"zoomniveaus alleen wijzigingen sinds 2006 minus wijzigingen die al waren "
+"verwerkt in OpenStreetMap"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcels"
@@ -17922,6 +18240,9 @@ msgid ""
 "has a pixel resolution of 6 inches and is comprised of imagery flown in "
 "2010, 2012, 2013, and 2014"
 msgstr ""
+"Meest recente ware kleurenafbeeldingen voor de staat North Carolina. De "
+"afbeeldingen hebben een pixelresolutie van 6 inches en zijn samengesteld uit "
+"afbeeldingen die werden verzameld in 2010, 2012, 2013, en 2014"
 
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service roads"
@@ -17930,9 +18251,11 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM images for mapping: Alaska Range"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
+"Recente afbeelding uit de zomer van de Alaska Range voor het in kaart "
+"brengen van natuurlijke objecten (ware kleuren)"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "NJ 2015 Aerial Imagery (Infrared)"
@@ -17940,6 +18263,7 @@ msgstr "NJ 2015 Aerial Imagery (Infrared)"
 msgid ""
 "Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
 msgstr ""
+"Digitale luchtfoto’s van New Jersey, bijna Infrarood, 1 foot resolutie"
 
 msgid "NJ 2015 Aerial Imagery (Natural Color)"
 msgstr "NJ 2015 Aerial Imagery (Natural Color)"
@@ -17947,6 +18271,7 @@ msgstr "NJ 2015 Aerial Imagery (Natural Color)"
 msgid ""
 "Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
 msgstr ""
+"Digitale luchtfoto’s van New Jersey, natuurlijke kleuren, 1 foot resolutie"
 
 msgid "San Juan Metro Area: 2013 USACE Orthophotos"
 msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
@@ -17958,6 +18283,8 @@ msgid ""
 "Public domain aerial imagery taken in May/June 2013 from San Juan County, "
 "WA. Resolution is 9 inch."
 msgstr ""
+"Publieke domein luchtfoto’s, genomen in mei/juni 2013 in San Juan County, "
+"WA. Resolutie is 9 inch."
 
 msgid "WA 2016 aerial imagery for San Juan County"
 msgstr "WA 2016 luchtfoto voor San Juan County"
@@ -17976,6 +18303,8 @@ msgid ""
 "Public domain street and address data from the San Juan County, WA. Updated "
 "at least quarterly."
 msgstr ""
+"Publieke domein straat- en adresgegevens van San Juan County, WA. Ten minste "
+"elk kwartaal bijgewerkt."
 
 msgid "Texas Orthophoto"
 msgstr "Texas Orthophoto"
@@ -17987,7 +18316,7 @@ msgid "MD Latest 6 Inch Aerial Imagery"
 msgstr "MD Laatste 6 Inch luchtfoto’s"
 
 msgid "Six Inch resolution aerial imagery for the State of Maryland"
-msgstr ""
+msgstr "Six Inch-resolutie luchtfoto’s van de staat Maryland"
 
 msgid "MD Three Inch Aerial Imagery"
 msgstr "MD Three Inch Aerial Imagery"
@@ -17996,6 +18325,8 @@ msgid ""
 "Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
 "Annapolis"
 msgstr ""
+"Drie-inch-resolutie luchtfoto’s voor de steden Rockville, Gaithersburg en "
+"Annapolis"
 
 msgid "MD Transportation Basemap"
 msgstr "MD Transportation Basemap"
@@ -18004,13 +18335,31 @@ msgid ""
 "Maryland State Highway Administration road features and additional Maryland "
 "focused landmarks"
 msgstr ""
+"Maryland State Highway Administration wegobjecten en aanvullend op Maryland "
+"gefocuste  kenmerken"
 
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 Orthophotography"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+"Deze gegevensset bestaat uit 0.3-meter pixelresolutie (bij benadering 1-"
+"foot), 4-band ware kleuren en bijna infrarood (R, G, B, IR) luchtfoto’s die "
+"Counties New Castle, Kent en Sussex in Delaware bedekken."
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+"Recente afbeelding van de de meest van de resterende gletsjers van de "
+"Rwenzori Mountains (valse kleuren IR)"
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 "imagico.de OSM-afbeeldingen voor in kaart brengen: Rwenzori Mountains 2016"
@@ -18063,240 +18412,771 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Aberdeen 1866-1867, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Airdrie 1858, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Alexandria 1859, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Alloa 1861-1862, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van  Annan 1859, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van  Arbroath 1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Ayr 1855, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Berwick-upon-Tweed 1852, ter beschikking "
+"gesteld door de National Library of Scotland."
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Brechin 1862, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Burntisland 1894, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Campbelton 1865, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Coatbridge 1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Cupar 1854, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Cupar 1893-1894, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dalkeith 1852, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dalkeith 1893, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dumbarton 1859, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dumfries 1850, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dumfries 1893, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dundee 1857-1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dundee 1870-1872, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dunfermline 1854, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Dunfermline 1894, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Edinburgh 1849-1851, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Edinburgh 1876-1877, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Edinburgh 1893-1894, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Town Plans, Edinburg 1940''s-1960''s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Edinburgh 1940s-1960s, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Elgin 1868, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Falkirk 1858-1859, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Forfar 1860-1861, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Forres 1868, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Galashiels 1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Girvan 1857, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Glasgow 1857-1858, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Glasgow 1892-1894, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Greenock 1857, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Haddington 1853, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Haddington 1893, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Hamilton 1858, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Hawick 1857-1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Inverness 1867-1868, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Irvine 1859, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Jedburgh 1858, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kelso 1857, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kilmarnock 1857-1859, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirkcaldy 1855, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirkcaldy 1894, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirkcudbright 1850, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirkcudbright 1893, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirkintilloch 1859, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Kirriemuir 1861, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Lanark 1858, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Linlithgow 1856, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Mayole 1856-1857, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Montrose 1861-1862, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Musselburgh 1853, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Musselburgh 1893, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Nairn 1867-1868, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Oban 1867-1868, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Paisley 1858, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Peebles 1856, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Perth 1860, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Peterhead 1868, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Port Glasgow 1856-1857, ter beschikking "
+"gesteld door de National Library of Scotland."
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Portobello 1893-1894, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Rothesay 1862-1863, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Selkirk 1865, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van St Andrews 1854, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van St Andrews 1893, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Stonehaven 1864, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Stonehaven 1864, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Stranraer 1847, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Stranraer 1863-1877, ter beschikking gesteld "
+"door de National Library of Scotland."
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Stranraer 1893, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Strathaven 1858, ter beschikking gesteld door "
+"de National Library of Scotland."
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Wick 1872, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Wigtown 1848, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+"Gedetailleerde stadskaart van Wigtown 1894, ter beschikking gesteld door de "
+"National Library of Scotland."
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr "Recente afbeeldingen Landsat"
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -25101,6 +25981,9 @@ msgstr "Viswinkel"
 msgid "Dairy"
 msgstr "Zuivel"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delicatessen (fijne kost)"
 
@@ -26583,13 +27466,13 @@ msgid "Inner segment"
 msgstr ""
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Daknok"
 
 msgid "Roof edge"
-msgstr ""
+msgstr "Dakrand"
 
 msgid "Building level"
-msgstr ""
+msgstr "Niveau gebouw"
 
 msgid "Site"
 msgstr "Locatie"
@@ -26901,10 +27784,10 @@ msgid "Test"
 msgstr "Test"
 
 msgid "View website"
-msgstr ""
+msgstr "Website bekijken"
 
 msgid "View URL"
-msgstr ""
+msgstr "URL bekijken"
 
 msgid "Send Email"
 msgstr "E-mail verzenden"
@@ -27223,7 +28106,7 @@ msgid "{0} on a node. Should be drawn as an area."
 msgstr "{0} op een knoop. Zou moeten worden getekend als een gebied."
 
 msgid "{0} on a node. Should be used in a relation"
-msgstr ""
+msgstr "{0} op een knoop. Zou moeten wordne gebruikt in een relatie"
 
 msgid "{0} on a way. Should be used on a node."
 msgstr "{0} op een weg. Zou moeten worden gebruikt op een knoop."
@@ -27304,7 +28187,7 @@ msgstr ""
 "om het watergebied te taggen."
 
 msgid "node connects highway and building"
-msgstr ""
+msgstr "knoop verbindt highway en building"
 
 msgid "abbreviated street name"
 msgstr "afgekorte straatnaam"
@@ -27329,6 +28212,8 @@ msgstr "{0} gebruikt met {1}"
 
 msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
 msgstr ""
+"{0} is vervallen, gebruik in plaats daarvan {1}. Controleer ook soortgelijke "
+"tags, zoals {2}"
 
 msgid ""
 "Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
@@ -27408,6 +28293,9 @@ msgstr "{0} moet een positief geheel getal zijn"
 msgid "unusual value of {0}"
 msgstr "ongebruikelijke waarde van {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relatie zonder type"
 
@@ -27430,7 +28318,7 @@ msgid "street name contains ss"
 msgstr "straatnaam bevat ss"
 
 msgid "street name contains ß"
-msgstr ""
+msgstr "straatnaam bevat ß"
 
 msgid "{0} is unnecessary"
 msgstr "{0} is niet nodig"
@@ -27451,6 +28339,8 @@ msgid ""
 "wikipedia tag has no language given, use ''wikipedia''=''language:page "
 "title''"
 msgstr ""
+"tag voor wikipedia heeft geen opgegeven taal, gebruik "
+"''wikipedia''=''language:page title''"
 
 msgid "wikipedia tag has an unknown language prefix"
 msgstr ""
@@ -28434,6 +29324,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importeren"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28445,25 +29338,25 @@ msgid "Images from my file system"
 msgstr ""
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Selecteer de afbeeldingen die u wilt importeren"
 
 msgid "All images in a directory"
-msgstr ""
+msgstr "Alle afbeeldingen in een map"
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Selecteer de map van waaruit u de afbeeldingen wilt importeren"
 
 msgid "From existing image layer"
-msgstr ""
+msgstr "Uit bestaande afbeeldingslaag"
 
 msgid "Import exception"
-msgstr ""
+msgstr "Uitzondering bij importeren"
 
 msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Kon de afbeelding ''{0}'' niet importeren!"
 
 msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "Kon de map ''{0}'' niet importeren!"
 
 msgid ""
 "A tag with key <i>{0}</i> is already present on the selected OSM object."
@@ -29439,6 +30332,29 @@ msgstr "Foutopsporing"
 msgid "Debugging mode will write images for each processing step."
 msgstr "Modus Foutopsporing zal afbeeldingen schrijven voor elke processtap"
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr "Adres ophalen"
 
@@ -29448,6 +30364,9 @@ msgstr "Austria Address Helper<br>Selecteer exact één object."
 msgid "Austria Address Helper"
 msgstr "Austria Address Helper"
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr "Met succes adres toegevoegd aan het geselecteerde object:"
 
@@ -34323,24 +35242,6 @@ msgstr "Bord {0}"
 msgid "Additional sign {0}"
 msgstr "Aanvullend bord {0}"
 
-msgid "Edit relation"
-msgstr "Relatie bewerken"
-
-msgid "Edit relations"
-msgstr "Relaties bewerken"
-
-msgid "No relation is selected"
-msgstr "Geen relatie geselecteerd"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Verwijder knoop ''{0}'' op positie {1} uit relatie ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Verwijder weg ''{0}'' op positie {1} uit relatie ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Verwijder relatie ''{0}'' op positie {1} uit relatie ''{2}''"
-
 msgid "routing active route"
 msgstr "routeren van actieve route"
 
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 3c5cd81..58dca10 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-07-15 12:49+0000\n"
 "Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:00+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:01+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: nn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 62449da..6128879 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2012-10-03 22:14+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:01+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:02+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5398,6 +5398,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5480,35 +5497,24 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
+msgid "(none)"
+msgstr "(pas cap)"
+
+msgid "deleted"
 msgstr ""
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "not deleted"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "Coordenadas :"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr "(pas cap)"
-
-msgid "deleted"
-msgstr ""
-
-msgid "not deleted"
-msgstr ""
-
 msgid "Keep my coordinates"
 msgstr ""
 
@@ -5554,12 +5560,6 @@ msgstr "Clau"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10125,9 +10125,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11824,7 +11821,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13093,7 +13090,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14210,9 +14212,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14222,9 +14221,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14235,9 +14231,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14820,6 +14824,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14847,6 +14857,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14877,6 +14890,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14925,21 +14941,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14981,15 +15008,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15005,6 +15047,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15110,9 +15158,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15122,6 +15176,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15206,9 +15263,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15224,31 +15308,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15267,13 +15380,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15282,21 +15395,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15315,6 +15438,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15327,6 +15453,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15454,16 +15583,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15496,15 +15630,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15516,15 +15660,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15585,18 +15745,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15660,18 +15839,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15705,26 +15895,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15734,15 +15933,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15750,6 +15963,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15888,23 +16104,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15931,18 +16159,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15976,6 +16220,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16054,12 +16301,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16115,8 +16370,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16140,345 +16395,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23064,6 +23705,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25309,6 +25953,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26281,6 +26928,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27133,6 +27783,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27142,6 +27815,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31679,24 +32355,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index c777702..ee0dd20 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-05-06 15:52+0000\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:02+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:03+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: pa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index b599588..b7864c0 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-30 13:24+0000\n"
-"Last-Translator: Piotr Sokół <Unknown>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-24 14:04+0000\n"
+"Last-Translator: Piotr Strębski <strebski at gmail.com>\n"
 "Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:03+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:04+0000\n"
+"X-Generator: Launchpad (build 18391)\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"
@@ -1323,10 +1323,10 @@ msgstr ""
 "obiekty niekompletne."
 
 msgid "Non-branching way sequences"
-msgstr "Nierozgałęziające sekwencje linii"
+msgstr "Nierozgałęzione sekwencje linii"
 
 msgid "Select non-branching sequences of ways"
-msgstr "Wybierz nierozgałęziającą się sekwencję linii"
+msgstr "Wybiera nierozgałęzioną sekwencję linii"
 
 msgid "Load Session"
 msgstr "Wczytaj sesję"
@@ -2438,7 +2438,7 @@ msgid ""
 "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
 msgstr ""
 "Przesuwaj obiekty przeciągając je; Shift, aby dodać do zaznaczenia (Ctrl, "
-"aby przełączać); Shift-Ctrl aby obracać zaznaczenie; Alt-Ctrl aby skalować "
+"aby przełączać); Shift-Ctrl aby odwracać zaznaczenie; Alt-Ctrl aby skalować "
 "zaznaczenie"
 
 msgid "Add and move a virtual new node to way"
@@ -4417,13 +4417,13 @@ msgid ""
 msgstr ""
 
 msgid "Area style on outer way"
-msgstr "Styl obszaru dla linii zewnętrznej"
+msgstr "Styl obszaru na linii zewnętrznej"
 
 msgid "Multipolygon is not closed"
 msgstr "Wielokąt złożony nie jest zamknięty"
 
 msgid "Multipolygon rings share node(s)"
-msgstr ""
+msgstr "Pierścienie wielokąta złożonego współdzielą węzły"
 
 msgid "Intersection between multipolygon ways"
 msgstr "Linie wielokąta złożonego przecinają się"
@@ -4442,9 +4442,10 @@ msgstr ""
 
 msgid "Multipolygon outer way shares segment(s) with other ring"
 msgstr ""
+"Linia zewnętrzna wielokąta złożonego współdzieli odcinek z innym pierścieniem"
 
 msgid "No useful role for multipolygon member"
-msgstr "Składnik wielokąta złożonego nie ma przypisanej roli"
+msgstr "Członek wielokąta złożonego nie ma przypisanej roli"
 
 msgid "Non-Way in boundary"
 msgstr ""
@@ -4471,13 +4472,15 @@ msgstr ""
 "Italia - Italien - Włochy."
 
 msgid "Missing name:*={0}. Add tag with correct language key."
-msgstr "Brakujący tag name:*={0}. Dodaj tag z prawidłowym kodem języka."
+msgstr ""
+"Brakujący znacznik name:*={0}. Proszę dodać znacznik z prawidłowym kodem "
+"języka."
 
 msgid "A name is missing, even though name:* exists."
 msgstr "Brak znacznika name, istnieje jednak name:*"
 
 msgid "Opening hours syntax"
-msgstr "Składnia Godzin Otwarcia"
+msgstr "Składnia godzin otwarcia"
 
 msgid "This test checks the correct usage of the opening hours syntax."
 msgstr "Ten test sprawdza poprawne użycie składni w godzinach otwarcia."
@@ -5867,6 +5870,23 @@ msgstr[0] "Ich wersja ({0} pozycja)"
 msgstr[1] "Ich wersja ({0} pozycje)"
 msgstr[2] "Ich wersja  ({0} pozycji)"
 
+msgid "My version (local dataset)"
+msgstr "Moja wersja (lokalna)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Właściwości w moim zestawie, np. lokalny zestaw"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr "Ich wersja (na serwerze)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Właściwości w ich zestawie, np. zestaw serwera"
+
 msgid "My with Their"
 msgstr "Moją z Ich"
 
@@ -5957,26 +5977,6 @@ msgstr ""
 "Połączone węzły jeszcze nie zamrożone. Nie można budować polecenia "
 "rozdzielczości."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Właściwości w moim zestawie, np. lokalny zestaw"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Właściwości w ich zestawie, np. zestaw serwera"
-
-msgid "Coordinates:"
-msgstr "Współrzędne:"
-
-msgid "Deleted State:"
-msgstr "Usunięte:"
-
-msgid "Referenced by:"
-msgstr "Odwołania do:"
-
 msgid "(none)"
 msgstr "(brak)"
 
@@ -5986,6 +5986,15 @@ msgstr "usunięto"
 msgid "not deleted"
 msgstr "nie zostały usunięte"
 
+msgid "Deleted State:"
+msgstr "Usunięte:"
+
+msgid "Coordinates:"
+msgstr "Współrzędne:"
+
+msgid "Referenced by:"
+msgstr "Odwołania do:"
+
 msgid "Keep my coordinates"
 msgstr "Zachowaj moje współrzędne"
 
@@ -6031,12 +6040,6 @@ msgstr "Klucz"
 msgid "Value"
 msgstr "Wartość"
 
-msgid "My version (local dataset)"
-msgstr "Moja wersja (lokalna)"
-
-msgid "Their version (server dataset)"
-msgstr "Ich wersja (na serwerze)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Zachowaj wybrane pary klucz/wartość z lokalnej wersji"
 
@@ -7338,7 +7341,7 @@ msgid "ID"
 msgstr "Identyfikator"
 
 msgid "Open"
-msgstr "Otwórz"
+msgstr "Otwarte"
 
 msgid "User"
 msgstr "Użytkownik"
@@ -11067,9 +11070,6 @@ msgstr "Zamknij okno i anuluj uwierzytelnianie"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Zamknij okno i zaakceptuj klucz dostępu"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Nie udało się anulować wykonywanej operacji OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Pobieranie Żetonu Żądania OAuth z „{0}''"
 
@@ -12885,8 +12885,8 @@ msgstr "Strefa PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Siatka szwajcarska (stosowana w Szwajcarii)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (bez korekty lokalnej)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Gwadelupa Fort-Marigot 1949"
@@ -14231,7 +14231,12 @@ msgstr "Anulowano wczytywanie"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -15538,9 +15543,6 @@ msgstr "Otwieranie adresu URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "Adres URL nie zawiera {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "zarezerwowane"
-
 msgid "Outdated Java version"
 msgstr "Nieaktualna wersja Javy"
 
@@ -15550,9 +15552,6 @@ msgstr "Uaktualnij Javę"
 msgid "You are running version {0} of Java."
 msgstr "Używana wersja {0} Java"
 
-msgid "April 2015"
-msgstr "Kwiecień 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15566,9 +15565,17 @@ msgstr ""
 "Program JOSM niedługo przestanie działać z tą wersją. Zaleca się uaktualnić "
 "Java do wersji {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Uaktualnić?"
 
+msgid "reserved"
+msgstr "zarezerwowane"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15700,7 +15707,7 @@ msgid "Failed to load XML schema."
 msgstr "Nie udało się wczytać schematu XML."
 
 msgid "You have encountered a bug in JOSM"
-msgstr "Napotkano błąd w JOSM"
+msgstr "Błąd programu"
 
 msgid ""
 "An unexpected exception occurred.\n"
@@ -15708,17 +15715,17 @@ msgid ""
 "JOSM, please consider being kind and file a bug report."
 msgstr ""
 "Wystąpił nieoczekiwany wyjątek.\n"
-"Zazwyczaj winą jest błąd programowania. Jeśli używana jest najnowsza wersja "
-"JOSM, proszę rozważyć zgłoszenie błędu."
+"Zazwyczaj winny jest błąd oprogramowania. Jeśli używana jest najnowsza "
+"wersja JOSM, proszę rozważyć zgłoszenie błędu."
 
 msgid "Debug information"
 msgstr "Informacje diagnozowania błędów"
 
 msgid "Manually report at:"
-msgstr ""
+msgstr "Strona ręcznego zgłaszania błędów:"
 
 msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "Uaktualnienia programu"
 
 msgid "Send bug report"
 msgstr "Wyślij raport o błędach"
@@ -15730,45 +15737,50 @@ msgid ""
 "include information on how to reproduce the error and try to supply as much "
 "detail as possible."
 msgstr ""
+"Jeśli uruchomiona jest najnowsza wersja programu i wtyczek, proszę zgłosić "
+"błąd za pośrednictwem systemu śledzenia błędów.\n"
+"Informacje o błędzie powinny zostać wypełnione automatycznie. Proszę "
+"dołączyć informacje o tym jak odtworzyć błąd i zawrzeć tak wiele szczegółów, "
+"jak to tylko możliwe."
 
 msgid "Report Bug"
 msgstr "Zgłoś błąd"
 
 msgid "Suppress this error for this session."
-msgstr ""
+msgstr "Pomijanie tego błędu dla tej sesji"
 
 msgid "Suppress further error dialogs for this session."
 msgstr "Nie pokazuj więcej raportów z błędami dla tej sesji."
 
 msgid "Ignore this error."
-msgstr "Ignoruj ten błąd."
+msgstr "Zignoruj ten błąd"
 
 msgid ""
 "Opening the bug report failed. Please report manually using this website:"
 msgstr ""
-"Nieudane zgłaszanie błędu. Proszę zgłosić błąd przy użyciu strony "
+"Nie udało się zgłosić błędu. Proszę zgłosić błąd przy użyciu strony "
 "internetowej:"
 
 msgid "Include the system status report."
-msgstr ""
+msgstr "Załączenie raportu stanu systemu"
 
 msgid "Include information about the data you were working on."
-msgstr ""
+msgstr "Załączenie informacji na temat opracowywanych danych"
 
 msgid "Include all stack traces."
-msgstr ""
+msgstr "Załączenie zrzutów stosu"
 
 msgid "Your current version of JOSM is {0}"
-msgstr "Twoja obecna wersja JOSM to {0}"
+msgstr "Uruchomiona wersja JOSM to {0}"
 
 msgid "JOSM is searching for updates..."
-msgstr "JOSM szuka aktualizacji..."
+msgstr "Wyszukiwanie aktualizacji..."
 
 msgid "An error occured while checking if your JOSM instance is up to date."
 msgstr "Wystąpił błąd podczas sprawdzania czy program jest aktualny."
 
 msgid "JOSM is up to date."
-msgstr "JOSM jest aktualny."
+msgstr "Program JOSM jest aktualny."
 
 msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
 msgstr ""
@@ -15779,6 +15791,8 @@ msgid ""
 "Before you file a bug report make sure you have updated to the latest "
 "version of JOSM here:"
 msgstr ""
+"Przed zgłoszeniem błędu, proszę upewnić się, że zainstalowano najnowszą "
+"wersję programu JOSM z tej strony:"
 
 msgid "Update JOSM"
 msgstr "Uaktualnij JOSM"
@@ -16176,6 +16190,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox - zdjęcia satelitarne"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16203,6 +16223,9 @@ msgstr "OpenStreetMap (styl niemiecki)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap - ślady GPS"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transport publiczny (ÖPNV)"
 
@@ -16233,6 +16256,9 @@ msgstr "Strava: termiczna mapa rowerowa i biegowa"
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -16281,21 +16307,32 @@ msgstr "OSM Inspector: Linia brzegowa (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16337,15 +16374,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at - ortofotomapy"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16361,6 +16413,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -16466,9 +16524,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -16478,6 +16542,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16562,9 +16629,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -16580,31 +16674,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -16623,13 +16746,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16638,21 +16761,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dania)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -16671,6 +16804,9 @@ msgstr ""
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16683,6 +16819,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Kataster"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16810,16 +16949,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16852,15 +16996,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16872,15 +17026,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16941,18 +17111,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -17016,18 +17205,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -17061,26 +17261,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -17090,15 +17299,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17106,6 +17329,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17244,23 +17470,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17287,18 +17525,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17332,6 +17586,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -17410,12 +17667,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17471,8 +17736,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17547,9 +17812,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17601,240 +17877,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23004,7 +23655,7 @@ msgstr "uniwersytet"
 
 msgctxt "building"
 msgid "college"
-msgstr ""
+msgstr "uczelnia"
 
 msgctxt "building"
 msgid "hospital"
@@ -23092,7 +23743,7 @@ msgstr "budynek użyteczności publicznej"
 
 msgctxt "building"
 msgid "ruins"
-msgstr ""
+msgstr "ruiny"
 
 msgctxt "building"
 msgid "Levels"
@@ -23107,7 +23758,7 @@ msgstr "mieszkalny"
 
 msgctxt "building"
 msgid "apartments"
-msgstr "blok (potocznie)"
+msgstr "blok mieszkalny"
 
 msgctxt "building"
 msgid "house"
@@ -23123,7 +23774,7 @@ msgstr "chata"
 
 msgctxt "building"
 msgid "bungalow"
-msgstr ""
+msgstr "bungalow"
 
 msgctxt "building"
 msgid "dormitory"
@@ -24454,6 +25105,9 @@ msgstr "Sklep rybny"
 msgid "Dairy"
 msgstr "Nabiał"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Delikatesy"
 
@@ -26713,6 +27367,9 @@ msgstr "{0} musi być dodatnią liczbą całkowitą"
 msgid "unusual value of {0}"
 msgstr "Niespotykana wartość {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relacja bez typu"
 
@@ -27698,6 +28355,9 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28550,6 +29210,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28559,6 +29242,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31518,7 +32204,7 @@ msgid "MapInfo files"
 msgstr ""
 
 msgid "Shapefiles"
-msgstr ""
+msgstr "Pliki Shapefile"
 
 msgid ""
 "Unable to detect Coordinate Reference System.\n"
@@ -33138,24 +33824,6 @@ msgstr "Znak {0}"
 msgid "Additional sign {0}"
 msgstr "Dodatkowy znak {0}"
 
-msgid "Edit relation"
-msgstr "Edytuj relację"
-
-msgid "Edit relations"
-msgstr "Edytuj relacje"
-
-msgid "No relation is selected"
-msgstr "Nie zaznaczono relacji"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
@@ -35157,7 +35825,7 @@ msgstr ""
 "11' 47.60” E</li></ul>"
 
 msgid "Tag multiple objects [alpha]"
-msgstr "Tagowanie wielu obiektów (wersja alfa)"
+msgstr "Nadaj znaczniki wielu obiektom (wersja alfa)"
 
 msgid "Edit tags of object list in table"
 msgstr ""
@@ -35166,7 +35834,7 @@ msgid "Tag multiple objects"
 msgstr "Zmień znaczniki wielu obiektom"
 
 msgid "Sync with JOSM selection"
-msgstr ""
+msgstr "Synchronizuje z zaznaczeniem"
 
 msgid "Zoom to objects"
 msgstr "Przybliż do obiektów"
@@ -35184,10 +35852,10 @@ msgid "Set tags for multiple objects"
 msgstr "Dodaj tagi dla wielu obiektów"
 
 msgid "Delete from history"
-msgstr "Usuń z historii"
+msgstr "Usuwa z historii"
 
 msgid "Find primitives with these tags"
-msgstr ""
+msgstr "Wyszukuje obiekty z wprowadzonymi znacznikami"
 
 msgid "Multitag Background: highlight"
 msgstr ""
@@ -35217,7 +35885,7 @@ msgstr "Zastąp geometrię dla węzła {0}"
 
 msgid "Relation is not a multipolygon, cannot be used as a replacement."
 msgstr ""
-"Ta relacja nie jest wielokątem złożonym i nie może być użyta do zastąpienia."
+"Ta relacja nie jest wielokątem złożonym i nie można jej użyć do zastąpienia."
 
 msgid ""
 "Please select one way that exists in the database and one new way with "
@@ -35314,7 +35982,7 @@ msgid "Select middle nodes"
 msgstr "Zaznacza środkowe węzły"
 
 msgid "Please select two nodes connected by way!"
-msgstr "Proszę wybrać dwa węzły połączone linią!"
+msgstr "Proszę zaznaczyć dwa węzły połączone linią!"
 
 msgid "Too many ways are added: {0}!"
 msgstr "Dodano zbyt dużo linii: {0}!"
@@ -35330,7 +35998,7 @@ msgid ""
 "primitives inside them!"
 msgstr ""
 "Nic nie odnaleziono. Proszę zaznaczyć zamknięte linie lub wielokąty złożone, "
-"aby wyszukać wszystkie elementy w środku."
+"aby wyszukać wszystkie wewnętrzne elementy."
 
 msgid "Area boundary [testing]"
 msgstr "Granica obszaru (testowe)"
@@ -35342,6 +36010,8 @@ msgid ""
 "Nothing found. Please select way that is a part of some polygon formed by "
 "connected ways"
 msgstr ""
+"Nic nie odnaleziono. Proszę zaznaczyć linię, która jest częścią wielokąta "
+"składającego się z połączonych linii."
 
 msgid "Select Highway"
 msgstr "Cała droga"
@@ -35368,7 +36038,8 @@ msgid "Undo selection"
 msgstr "Cofnij zaznaczenie"
 
 msgid "Reselect last added object or selection form history"
-msgstr "Wybierz ponownie ostatnio dodane elementy lub zaznaczenia z historii"
+msgstr ""
+"Zaznacza ostatnio dodane elementy lub przywraca zaznaczenie z historii"
 
 msgid "Unselect nodes"
 msgstr "Odznacz węzły"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 97a86bf..e91c514 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-04-07 16:38+0000\n"
 "Last-Translator: Rui <xande6ruz at yandex.com>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:03+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:04+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: pt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5909,6 +5909,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Versão no servidor ({0} entrada)"
 msgstr[1] "Versão no servidor ({0} entradas)"
 
+msgid "My version (local dataset)"
+msgstr "Minha versão"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Propriedades na minha versão"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propriedades na versão de fusão. Irão substituir as propriedades dos meus "
+"elementos ao aplicar as decisões de fusão."
+
+msgid "Their version (server dataset)"
+msgstr "Versão no servidor"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Propriedades na versão do servidor"
+
 msgid "My with Their"
 msgstr "Minha versão com a o servidor"
 
@@ -5997,28 +6016,6 @@ msgstr ""
 "Nós mesclados ainda não congelados. Não é possível construir comando de "
 "resolução"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Propriedades na minha versão"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propriedades na versão de fusão. Irão substituir as propriedades dos meus "
-"elementos ao aplicar as decisões de fusão."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Propriedades na versão do servidor"
-
-msgid "Coordinates:"
-msgstr "Coordenadas:"
-
-msgid "Deleted State:"
-msgstr "Estado eliminado:"
-
-msgid "Referenced by:"
-msgstr "Referidas por:"
-
 msgid "(none)"
 msgstr "(nenhum)"
 
@@ -6028,6 +6025,15 @@ msgstr "eliminado"
 msgid "not deleted"
 msgstr "não eliminado"
 
+msgid "Deleted State:"
+msgstr "Estado eliminado:"
+
+msgid "Coordinates:"
+msgstr "Coordenadas:"
+
+msgid "Referenced by:"
+msgstr "Referidas por:"
+
 msgid "Keep my coordinates"
 msgstr "Manter as minhas coordenadas"
 
@@ -6073,12 +6079,6 @@ msgstr "Chave"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "Minha versão"
-
-msgid "Their version (server dataset)"
-msgstr "Versão no servidor"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Manter a minha etiqueta que selecionei"
 
@@ -11212,9 +11212,6 @@ msgstr "Fechar a janela e cancelar a autorização"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Fechar a janela e aceitar o Token de Acesso"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Não foi possível cancelar a operação de OAuth a decorrer"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "A obter o Token de Pedido OAuth de ''{0}''"
 
@@ -13119,8 +13116,8 @@ msgstr "Zona PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grelha Sueca (Suíça)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sem correções locais)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Fort-Marigot Guadalupe 1949"
@@ -14565,10 +14562,13 @@ msgstr "A leitura foi cancelada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Faltam atributos obrigatórios no elemento ''bounds''. Obteve-se "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "A linha eliminada {0} contém nós"
@@ -15921,9 +15921,6 @@ msgstr "A abrir o URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "O URL não contém {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reservado"
-
 msgid "Outdated Java version"
 msgstr "Versão do JAVA desatualizada"
 
@@ -15933,9 +15930,6 @@ msgstr "Atualizar o JAVA"
 msgid "You are running version {0} of Java."
 msgstr "Está a usar a versão do JAVA {0}."
 
-msgid "April 2015"
-msgstr "Abril de 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15950,9 +15944,17 @@ msgstr ""
 "Brevemente o JOSM não funcionará com esta versão do Java; é recomendável "
 "atualizar para a versão do Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Quer atualizar agora?"
 
+msgid "reserved"
+msgstr "reservado"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16597,6 +16599,12 @@ msgstr "HDM (Equipa Humanitária do OpenStreetMap)"
 msgid "Mapbox Satellite"
 msgstr "Satélite Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16624,6 +16632,9 @@ msgstr "OpenStreetMap (Estilo Alemão)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "Trilhos GPS no OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transportes Públicos (ÖPNV)"
 
@@ -16654,6 +16665,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator - Sobreposição"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -16702,21 +16716,32 @@ msgstr "OSM Inspector: Linha costeira (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16758,15 +16783,30 @@ msgstr "LPI NSW Fronteiras Administrativas - Subúrbio - Reserva NPWS"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Ortofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16782,6 +16822,12 @@ msgstr "Tiris: DOM (Modelo de superfície)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: linhas de contorno"
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viena: Mehrzweckkarte (usos gerais)"
 
@@ -16887,9 +16933,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos (Brasil)"
 
@@ -16899,6 +16951,9 @@ msgstr "IBGE Mapa de Setores Rurais (Brasil)"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16983,9 +17038,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase - Hidrografia"
 
@@ -17001,31 +17083,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna (Canadá) 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna (Canadá) Estradas sobrepostas"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Checoslováquia - CUZK:KM"
 
@@ -17044,14 +17155,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Dinamarca)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -17059,21 +17170,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estónia - Mapa Base (Maaamet)"
 
@@ -17092,6 +17213,9 @@ msgstr "Estónia - Florestas (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17104,6 +17228,9 @@ msgstr "Bordéus - 2012"
 msgid "Cadastre"
 msgstr "Cadastro"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvérnia 2013 - 25 cm"
 
@@ -17234,16 +17361,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17276,15 +17408,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17296,15 +17438,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Imagens de Drone (Haiti)"
 
@@ -17366,18 +17524,37 @@ msgstr "Hillshade Hungria"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Departamento de Guerra da Irlanda Britânica 1:25k GSGS 3906"
 
@@ -17442,18 +17619,29 @@ msgstr "Tirol do Sul - Ortofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "Tirol do Sul - Mapa Topográfico"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Letónia"
 
@@ -17487,26 +17675,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta do Níger Outubro 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Ortofoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Faixa de Gaza - Pléiades - 2014/07/06"
 
@@ -17516,15 +17713,29 @@ msgstr "Faixa de Gaza - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17532,6 +17743,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17670,23 +17884,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17713,18 +17939,34 @@ msgstr "RABA-KGZ: Eslovénia - áreas com contruções"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "África do Sul CD:NGI Aérea"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17758,6 +18000,9 @@ msgstr "Ilhas Canárias GRAFCAN Express"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Cantão da Argóvia 25cm (AGIS 2011)"
 
@@ -17836,12 +18081,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (com linha de contorno)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Fronteiras de Aldeias"
 
@@ -17897,8 +18150,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17973,9 +18226,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -18027,240 +18291,615 @@ msgstr "NLS - Bartholomew Meia Polegada, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -25057,6 +25696,9 @@ msgstr "Peixaria"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Loja de Gourmet"
 
@@ -27345,6 +27987,9 @@ msgstr "{0} tem de ser um número inteiro positivo"
 msgid "unusual value of {0}"
 msgstr "valor incomum de  {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relação sem a etiqueta \"type\" (tipo de relação)"
 
@@ -28355,6 +29000,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29330,6 +29978,29 @@ msgstr "Depuração (debug)"
 msgid "Debugging mode will write images for each processing step."
 msgstr "O modo de depuração grava imagens para cada passo do processamento"
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29339,6 +30010,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -34175,24 +34849,6 @@ msgstr "Sinal {0}"
 msgid "Additional sign {0}"
 msgstr "Sinal adicional {0}"
 
-msgid "Edit relation"
-msgstr "Editar relação"
-
-msgid "Edit relations"
-msgstr "Editar relações"
-
-msgid "No relation is selected"
-msgstr "Nenhuma relação selecionada"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover nó ''{0}'' na posição {1} da relação ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover linha ''{0}'' na posição {1} da relação ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover relação ''{0}'' na posição {1} da relação ''{2}''"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index d1d7b95..8c26bc3 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-04 01:17+0000\n"
-"Last-Translator: André Marcelo Alvarenga <andrealvarenga at gmx.net>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-20 04:47+0000\n"
+"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
 "Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:14+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:15+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: pt_BR\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -3612,7 +3612,7 @@ msgid "Matrix set identifier"
 msgstr "Matrix set identifier"
 
 msgid "No default layer selected, choosing first layer."
-msgstr ""
+msgstr "Sem camada padrão selecionada, escolhendo primeira camada."
 
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Nenhuma camada definida pelo documento getCapabilities: {0}"
@@ -3627,6 +3627,8 @@ msgid ""
 "Can''t use layer {0} because no supported formats where found. Layer is "
 "available in formats: {1}"
 msgstr ""
+"Não é possível usar a camada {0} pois formatos não suportados foram "
+"encontrados. A camada está disponível nos formatos: {1}"
 
 msgid ""
 "Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -5844,6 +5846,25 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] "Versão deles ({0} entrada)"
 msgstr[1] "Versão deles ({0} entradas)"
 
+msgid "My version (local dataset)"
+msgstr "Minha versão (dados locais)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Propriedades de meus dados, ou seja, os dados locais"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Propriedades no elemento combinado. Elas irão substituir propriedades nos "
+"meus elementos quando decisões de combinação forem aplicadas."
+
+msgid "Their version (server dataset)"
+msgstr "Versão deles (dados do servidor)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Propriedades nos dados dele(s), ou seja, o servidor de dados"
+
 msgid "My with Their"
 msgstr "Meu com o deles"
 
@@ -5932,28 +5953,6 @@ msgstr ""
 "Nós mesclados ainda não congelados. Não é possível construir comando de "
 "resolução."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Propriedades de meus dados, ou seja, os dados locais"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propriedades no elemento combinado. Elas irão substituir propriedades nos "
-"meus elementos quando decisões de combinação forem aplicadas."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Propriedades nos dados dele(s), ou seja, o servidor de dados"
-
-msgid "Coordinates:"
-msgstr "Coordenadas:"
-
-msgid "Deleted State:"
-msgstr "Estado excluído:"
-
-msgid "Referenced by:"
-msgstr "Referenciado por:"
-
 msgid "(none)"
 msgstr "(nenhum)"
 
@@ -5963,6 +5962,15 @@ msgstr "removido"
 msgid "not deleted"
 msgstr "não apagado"
 
+msgid "Deleted State:"
+msgstr "Estado excluído:"
+
+msgid "Coordinates:"
+msgstr "Coordenadas:"
+
+msgid "Referenced by:"
+msgstr "Referenciado por:"
+
 msgid "Keep my coordinates"
 msgstr "Manter minhas coordenadas"
 
@@ -6008,12 +6016,6 @@ msgstr "Chave"
 msgid "Value"
 msgstr "Valor"
 
-msgid "My version (local dataset)"
-msgstr "Minha versão (dados locais)"
-
-msgid "Their version (server dataset)"
-msgstr "Versão deles (dados do servidor)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Manter o par chave/valor selecionado dos dados locais"
 
@@ -9900,7 +9902,7 @@ msgstr[0] "{0} objeto a remover:"
 msgstr[1] "{0} objetos a remover:"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Projeções nativas"
 
 msgid "Offset"
 msgstr "Deslocamento:"
@@ -9912,7 +9914,7 @@ msgid "Tile display projection"
 msgstr ""
 
 msgid "Current zoom"
-msgstr ""
+msgstr "Aproximação atual"
 
 msgid "Show tile info"
 msgstr "Mostrar informações da tile"
@@ -9933,7 +9935,7 @@ msgid "Tile display size"
 msgstr ""
 
 msgid "Reprojection"
-msgstr ""
+msgstr "Reprojeção"
 
 msgid "Reprojected tile size"
 msgstr ""
@@ -10062,10 +10064,10 @@ msgid "Id"
 msgstr "Id"
 
 msgid "Min. zoom"
-msgstr ""
+msgstr "Aproximação min."
 
 msgid "Max. zoom"
-msgstr ""
+msgstr "Aproximação Max."
 
 msgid "Unsupported imagery type: {0}"
 msgstr "Tipo de camada não suportada: {0}"
@@ -10138,7 +10140,7 @@ msgid "Upload is discouraged"
 msgstr "Upload não é aconselhado"
 
 msgid "Upload is blocked"
-msgstr ""
+msgstr "Carregamento está bloqueado"
 
 msgid "Convert to GPX layer"
 msgstr "Converter para camada GPX"
@@ -10193,9 +10195,11 @@ msgid ""
 "Reprojecting layer {0} from {1} to {2}. For best image quality and "
 "performance, switch to one of the supported projections: {3}"
 msgstr ""
+"Reprojetando camada {0} de {1} a {2}. Para melhor performance e qualidade de "
+"imagem, troque para uma das projeções suportadas: {3}"
 
 msgid "Unable to find supported projection for layer {0}. Using {1}."
-msgstr ""
+msgstr "Impossível encontrar projeção suportada para camada {0}. Usando {1}."
 
 msgid "Correlate to GPX"
 msgstr "Correlacionar com GPX"
@@ -11100,9 +11104,6 @@ msgstr "Feche o diálogo e cancele a autorização"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Feche o diálogo e aceite o Token de Acesso"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Falhou em interromper a operação OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Obtendo um Token de Requisição do OAuth de ''{0}''"
 
@@ -11976,7 +11977,7 @@ msgstr "A Pé"
 
 msgctxt "Heat map"
 msgid "User Normal"
-msgstr ""
+msgstr "Usuário Normal"
 
 msgctxt "Heat map"
 msgid "User Light"
@@ -11984,7 +11985,7 @@ msgstr ""
 
 msgctxt "Heat map"
 msgid "Traffic Lights"
-msgstr ""
+msgstr "Semáforo"
 
 msgctxt "Heat map"
 msgid "Inferno"
@@ -12140,7 +12141,7 @@ msgid "Overlay gain adjustment"
 msgstr ""
 
 msgid "Lower limit of visibility"
-msgstr ""
+msgstr "Limite inferior de visibilidade"
 
 msgid "Adjust the gain of overlay blending."
 msgstr ""
@@ -12197,7 +12198,7 @@ msgid "Reverse zoom with mouse wheel"
 msgstr ""
 
 msgid "Intermediate steps between native resolutions"
-msgstr ""
+msgstr "Passos intermediários entre as resoluções nativas"
 
 msgid "Show localized name in selection lists, if available"
 msgstr "Mostra os nomes traduzidos nas listas de seleção, de disponíveis"
@@ -12229,7 +12230,7 @@ msgstr ""
 "ficam mais bonitos, mas não suportam alguns recursos como filtros de arquivo"
 
 msgid "Check if you feel opposite direction more convenient"
-msgstr ""
+msgstr "Checar se a direção oposta é mais conveniente"
 
 msgid ""
 "Divide intervals between native resolution levels to smaller steps if they "
@@ -12972,8 +12973,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grade Suíça"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (sem correções locais) </i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14383,10 +14384,13 @@ msgstr "A leitura foi cancelada"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Faltando atributos obrigatórios no elemento ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Via {0} excluída contem nós"
@@ -15729,9 +15733,6 @@ msgstr "Abrindo URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL não contem {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "reservado"
-
 msgid "Outdated Java version"
 msgstr "Versão desatualizada do Java"
 
@@ -15741,9 +15742,6 @@ msgstr "Atualize o Java"
 msgid "You are running version {0} of Java."
 msgstr "Você está executando a versão {0} do Java."
 
-msgid "April 2015"
-msgstr "Abril de 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15758,9 +15756,17 @@ msgstr ""
 "Em breve o JOSM irá parar de trabalhar com esta versão; recomendamos que "
 "você atualize para o Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Deseja atualizar agora?"
 
+msgid "reserved"
+msgstr "reservado"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16388,6 +16394,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Satélite Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16415,6 +16427,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Transportes Públicos (ÖPNV)"
 
@@ -16445,6 +16460,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA No Address"
 
@@ -16493,21 +16511,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16549,15 +16578,30 @@ msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16573,6 +16617,12 @@ msgstr "Tiris: DOM (Modelo de superfície)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
 
@@ -16678,9 +16728,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16690,6 +16746,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaico 2013"
 
@@ -16774,9 +16833,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrography"
 
@@ -16792,31 +16878,60 @@ msgstr "Mosaico Columbia Britânica"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
@@ -16835,14 +16950,14 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr ""
@@ -16850,21 +16965,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estónia Basemap (Maaamet)"
 
@@ -16883,6 +17008,9 @@ msgstr "Estônia Forestry (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16895,6 +17023,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastro"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17025,16 +17156,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -17067,15 +17203,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17087,15 +17233,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Imagery (Haiti)"
 
@@ -17156,18 +17318,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17231,18 +17412,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "USSR - Latvia"
 
@@ -17276,26 +17468,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta Oct 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Gaza Strip - Pléiades - 2014/07/06"
 
@@ -17305,15 +17506,29 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17321,6 +17536,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17459,23 +17677,35 @@ msgstr "fator de escala"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17502,18 +17732,34 @@ msgstr "RABA-KGZ: Slovenia built-up areas"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17547,6 +17793,9 @@ msgstr "GRAFCAN Express - Ilhas Canárias"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17625,12 +17874,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (with Contour Line)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Village Boundaries"
 
@@ -17686,8 +17943,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17762,9 +18019,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17816,240 +18084,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24805,6 +25448,9 @@ msgstr "Peixaria / Frutos do Mar"
 msgid "Dairy"
 msgstr "Laticínios"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (comida requintada)"
 
@@ -27094,6 +27740,9 @@ msgstr "{0} deve ser um número inteiro positivo"
 msgid "unusual value of {0}"
 msgstr "valor não usual de {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr "{0} deve ser um valor numérico, em metros e sem unidade"
+
 msgid "relation without type"
 msgstr "relações sem tipo"
 
@@ -28099,6 +28748,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29073,6 +29725,29 @@ msgid "Debugging mode will write images for each processing step."
 msgstr ""
 "Modo de depuração vai escrever imagens para cada etapa de processamento."
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29082,6 +29757,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33897,24 +34575,6 @@ msgstr "Sinal {0}"
 msgid "Additional sign {0}"
 msgstr "Sinal adicional {0}"
 
-msgid "Edit relation"
-msgstr "Editar relação"
-
-msgid "Edit relations"
-msgstr "Editar relações"
-
-msgid "No relation is selected"
-msgstr "Sem relações selecionadas"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover nó ''{0}'' na posição {1} da relação ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover caminho ''{0}'' na posição {1} da relação ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Remover relação ''{0}'' na posição {1} da relação ''{2}''"
-
 msgid "routing active route"
 msgstr "roteamento de rota ativa"
 
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 81db343..8534c31 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-06-21 19:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:04+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:05+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 9640a39..3a84353 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-02-24 11:34+0000\n"
 "Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:04+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:06+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "X-Poedit-Country: ROMANIA\n"
 "Language: ro\n"
 "X-Poedit-Language: Romanian\n"
@@ -5445,6 +5445,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5527,33 +5544,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgid "deleted"
+msgstr "şters"
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "deleted"
-msgstr "şters"
-
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5601,12 +5607,6 @@ msgstr "Cheie"
 msgid "Value"
 msgstr "Valoare"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10174,9 +10174,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11877,7 +11874,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13147,7 +13144,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14264,9 +14266,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14276,9 +14275,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14289,9 +14285,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14874,6 +14878,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14901,6 +14911,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14931,6 +14944,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14979,21 +14995,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15035,15 +15062,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15059,6 +15101,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15164,9 +15212,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15176,6 +15230,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15260,9 +15317,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15278,31 +15362,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15321,13 +15434,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15336,21 +15449,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15369,6 +15492,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15381,6 +15507,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15508,16 +15637,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15550,15 +15684,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15570,15 +15714,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15639,18 +15799,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15714,18 +15893,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15759,26 +15949,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15788,15 +15987,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15804,6 +16017,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15942,23 +16158,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15985,18 +16213,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16030,6 +16274,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16108,12 +16355,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16169,8 +16424,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16194,345 +16449,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23118,6 +23759,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25363,6 +26007,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26335,6 +26982,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27187,6 +27837,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27196,6 +27869,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31733,24 +32409,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index a2e87b3..ac7a034 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-05-02 10:38+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-26 18:05+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
 "Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:05+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:06+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ru_RU\n"
 
 msgid "Use OAuth"
@@ -5901,6 +5901,25 @@ msgstr[0] "Их версия ({0} запись)"
 msgstr[1] "Их версия ({0} записей)"
 msgstr[2] "Их версия ({0} записей)"
 
+msgid "My version (local dataset)"
+msgstr "Моя версия (локальный набор данных)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Свойства в моём наборе данных, то есть локальном наборе данных"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Параметры в объединённом элементе. Параметры в моих элементах будут заменены "
+"при применении объединения."
+
+msgid "Their version (server dataset)"
+msgstr "Их версия (серверный набор данных)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Свойства в их наборе данных, то есть серверном наборе данных"
+
 msgid "My with Their"
 msgstr "Мою с их"
 
@@ -5991,28 +6010,6 @@ msgstr ""
 "Объединённые точки ещё не заблокированы. Невозможно построить команду "
 "устранения конфликтов."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Свойства в моём наборе данных, то есть локальном наборе данных"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Параметры в объединённом элементе. Параметры в моих элементах будут заменены "
-"при применении объединения."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Свойства в их наборе данных, то есть серверном наборе данных"
-
-msgid "Coordinates:"
-msgstr "Координаты:"
-
-msgid "Deleted State:"
-msgstr "Удалён:"
-
-msgid "Referenced by:"
-msgstr "Ссылаются:"
-
 msgid "(none)"
 msgstr "(отсутствует)"
 
@@ -6022,6 +6019,15 @@ msgstr "удалён"
 msgid "not deleted"
 msgstr "не удалён"
 
+msgid "Deleted State:"
+msgstr "Удалён:"
+
+msgid "Coordinates:"
+msgstr "Координаты:"
+
+msgid "Referenced by:"
+msgstr "Ссылаются:"
+
 msgid "Keep my coordinates"
 msgstr "Хранить мои координаты"
 
@@ -6070,12 +6076,6 @@ msgstr "Ключ"
 msgid "Value"
 msgstr "Значение"
 
-msgid "My version (local dataset)"
-msgstr "Моя версия (локальный набор данных)"
-
-msgid "Their version (server dataset)"
-msgstr "Их версия (серверный набор данных)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Оставить выделенные пары ключ/значение из локального набора данных"
 
@@ -10020,16 +10020,16 @@ msgstr[1] "Удалить {0} объекта:"
 msgstr[2] "Удалить {0} объектов:"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Исходные проекции"
 
 msgid "Offset"
 msgstr "Смещение"
 
 msgid "Tile download projection"
-msgstr ""
+msgstr "Проекция загружаемых тайлов"
 
 msgid "Tile display projection"
-msgstr ""
+msgstr "Проекция отображения тайлов"
 
 msgid "Current zoom"
 msgstr "Текущий масштаб"
@@ -10050,13 +10050,13 @@ msgid "Tile size"
 msgstr "Размер квадрата"
 
 msgid "Tile display size"
-msgstr ""
+msgstr "Размер отображения тайла"
 
 msgid "Reprojection"
-msgstr ""
+msgstr "Перепроецирование"
 
 msgid "Reprojected tile size"
-msgstr ""
+msgstr "Размер перепроецированнного тайла"
 
 msgid "Metadata "
 msgstr "Метаданные "
@@ -11242,9 +11242,6 @@ msgstr "Закрыть диалог и отменить авторизацию"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Закрыть диалог и принять маркер доступа"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Не удалось отменить выполняющуюся операцию OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Получение маркера запроса OAuth от ''{0}''"
 
@@ -12520,6 +12517,8 @@ msgstr "Доступные по умолчанию:"
 
 msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
 msgstr ""
+"Новые доступные по умолчанию элементы можно добавить в <a "
+"href=\"{0}\">Wiki</a>."
 
 msgid "Selected entries:"
 msgstr "Выбранные:"
@@ -13108,8 +13107,8 @@ msgstr "Зона PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская проекция"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (без локальных коррекций)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14511,10 +14510,17 @@ msgstr "Чтение было отменено"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+"Отсутствуют обязательные атрибуты элемента ''bounds''. Получено: "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Отсутствуют обязательные атрибуты элемента \"границы\". Определены  "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Недопустимое значение для атрибутов ''lat'', ''lon'' в точке с ID {0}. "
+"Получено ''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Удалённая линия {0} содержит точки"
@@ -15894,9 +15900,6 @@ msgstr "Открытие URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL не содержит {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "зарезервировано"
-
 msgid "Outdated Java version"
 msgstr "Устаревшая версия Java"
 
@@ -15906,9 +15909,6 @@ msgstr "Обновить Java"
 msgid "You are running version {0} of Java."
 msgstr "У вас версия Java {0}."
 
-msgid "April 2015"
-msgstr "Апрель 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15923,9 +15923,19 @@ msgstr ""
 "JOSM скоро перестанет работать с этой версией. Мы настоятельно рекомендуем "
 "выполнить обновление до Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+"Вы можете столкнуться с критическими ошибками Java; мы рекомендуем вам "
+"обновиться до Java {0}."
+
 msgid "Would you like to update now ?"
 msgstr "Хотите выполнить обновление сейчас?"
 
+msgid "reserved"
+msgstr "зарезервировано"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16560,6 +16570,12 @@ msgstr "HDM (команда по созданию карт гуманитарн
 msgid "Mapbox Satellite"
 msgstr "Спутниковые снимки Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "Снимки DigitalGlobe Premium"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "Снимки DigitalGlobe Standard"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16587,6 +16603,9 @@ msgstr "OpenStreetMap (немецкий стиль)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "GPS-треки OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Общедоступные GPS-треки, загруженные на OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Общественный транспорт (ÖPNV)"
 
@@ -16617,6 +16636,9 @@ msgstr "Теплокарта Strava для велосипедистов и бе
 msgid "Locator Overlay"
 msgstr "MapBox Locator (оверлей)"
 
+msgid "Shows major features to help orient you."
+msgstr "Показывает основные объекты, помогающие сориентироваться."
+
 msgid "QA No Address"
 msgstr "QA (без адресов)"
 
@@ -16665,9 +16687,23 @@ msgstr "OSM Inspector: береговая линия (ЕС)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "Снимки с imagico.de: горный массив Проклетие"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Снимки конца лета, когда обычные источники сильно ограничены облаками и "
+"снегом (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "Снимки с imagico.de: «Южные» Трансантарктические горы"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+"За пределами обычного покрытия Landsat, поэтому отсутствует в LIMA и "
+"Bing/Mapbox (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "Снимки с imagico.de: горы Пенсакола"
 
@@ -16675,15 +16711,16 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 "Снимки с imagico.de: остров Мордвинова (Элефант)/остров Шишкова (Кларенс)"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+"Достаточно чистые актуальные снимки для обновления границ ледника "
+"(естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr "Снимки с imagico.de: Земля Эндерби и Берег Кемпа"
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
-msgstr ""
-"Sentinel-2 каналы 234 (true color), снимки Sentinel-2 Земли Эндерби и Берега "
-"Кемпа, начало 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
+msgstr "Sentinel-2 - снимки Земли Эндерби и Берега Кемпа (true color)"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Аргентина (TMS)"
@@ -16724,15 +16761,32 @@ msgstr "LPI NSW административные границы охраняем
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "Снимки с imagico.de: северо-запад острова Херд"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "Снимки с imagico.de: побережье острова Херд"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+"Последние изображения острова Херд с в основном закрытой облаками внутренней "
+"частью, но хорошо видимым побережьем (естественные цвета)"
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Базовая карта Австрии на основе правительственных данных."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at ортофото"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Слой ортоснимков, предоставленных basemap.at. "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16748,6 +16802,12 @@ msgstr "Tiris: DOM (модель поверхности)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: горизонтали"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: ортофото"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: ортофото в ИК-диапазоне"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Вена: многоцелевая карта (общего назначения)"
 
@@ -16853,9 +16913,19 @@ msgstr "Бенин: Котону 2016 (Pleiade)"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "Снимки с imagico.de: Котону"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+"Фрагментарное и частично закрытое облаками покрытие в обычных источниках "
+"(естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "Снимки с imagico.de: остров Буве"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+"Для более точного картографирования  береговой линии и ледников "
+"(естественные цвета)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE: карта городских районов"
 
@@ -16865,6 +16935,9 @@ msgstr "IBGE: карта сельских районов"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Федеральный округ"
 
+msgid "Addresses data from IBGE"
+msgstr "Адресные данные из IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Рио, мозаика 2013"
 
@@ -16949,7 +17022,34 @@ msgstr "Литораль штата Алагоас, 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr "IBGE-BC250-Изолированные сельские кластеры"
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr "IBGE-BC250-Взлётно-посадочные полосы"
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr "IBGE-BC250-Речные бассейны"
+
 msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Дорожная сеть"
+
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr "IBGE-BCIM-Электростанции"
+
+msgid "IBGE-BCIM-Município"
 msgstr ""
 
 msgid "Geobase Hydrography"
@@ -16967,31 +17067,67 @@ msgstr "Мозаика Британской Колумбии"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Последние снимки Landsat юго-запада Британской Колумбии"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+"Недавние снимки Landsat юго-запада Британской Колумбии в низком разрешении"
+
 msgid "Kelowna 2012"
 msgstr "Келоуна 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "Высококачественные аэрофотоснимки города Келоуна"
+
 msgid "Kelowna Roads overlay"
 msgstr "Келоуна - оверлей дорог"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "Снимки с imagico.de: восточное побережье острова Девон"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "Снимки с imagico.de: север острова Элсмир"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Собрано из снимков ASTER от июля 2012 (естественные цвета с восстановленным "
+"синим каналом)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr "Снимки с imagico.de: остров Элсмир, июль 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Собрано из снимков ASTER от июля 2016 (естественные цвета с восстановленным "
+"синим каналом)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "Снимки с imagico.de: остров Фогу, Кабо-Верде"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Снимки после извержения 2014/2015 годов (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "Снимки с imagico.de: остров Лондондерри"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+"Позволяет улучшить ряд очень грубых линий побережья, из-за плотного снежного "
+"покрова не подходит для обрисовки ледников (ИК в псевдоцветах)"
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "Снимки с imagico.de: вулкан Кальбуко"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Снимки после извержения 2015 года (естественные цвета)"
+
 msgid "Czech CUZK:KM"
 msgstr "Чехия CUZK:KM"
 
@@ -17010,14 +17146,14 @@ msgstr "Praha IPR: последние ортофото"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Дания)"
+msgid "SDFE aerial imagery"
+msgstr "Аэрофотоснимки SDFE"
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen: кадастровые участки по INSPIRE"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr "SDFE цифровые топографические карты 1:25 000 (Kort25)"
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "Дания: отмывка рельефа SDFE (40 см)"
@@ -17025,22 +17161,36 @@ msgstr "Дания: отмывка рельефа SDFE (40 см)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "Дания: отмывка поверхности SDFE 40 см)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Стевнс (Дания)"
+msgid "Stevns"
+msgstr "Стевнс"
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Дания)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "Снимки с imagico.de: вулкан Алтар"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+"Снимки ASTER 2007 обеспечивают лучший охват ледников, чем обычные источники "
+"(естественные цвета с восстановленным синим каналом)"
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "Снимки с imagico.de: острова Дарвин (Кулпеппер) и Вулф (Уэнмен), Галапагос"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+"Недавние снимки, в других источниках сейчас лишь старые  и плохие снимки "
+"(естественные цвета)"
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Эстония: базовая карта (Maaamet)"
 
@@ -17059,6 +17209,9 @@ msgstr "Эстония: лесные массивы (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "Реестр адресов Франции или национальная база адресов"
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17071,6 +17224,9 @@ msgstr "Бордо - 2012"
 msgid "Cadastre"
 msgstr "Кадастр"
 
+msgid "French land registry"
+msgstr "Реестр земель Франции"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Овернь 2013 - 25 см"
 
@@ -17198,21 +17354,28 @@ msgid ""
 msgstr "Снимки с imagico.de: прибрежные отмели Северной Германии"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+"Новые снимки берега во время отлива для обновления на карте ваттов и баров "
+"(естественные цвета)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "Снимки с imagico.de: прибрежные отмели Северной Германии (инфракрасные "
 "снимки)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "Снимки с imagico.de: побережье Северного моря, 2016"
-
 msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
-"каналы 234 (true color), новые снимки берега при отливе для обновления карт "
-"осушек (ваттов) и подводных отмелей (баров)"
+"Свежие снимки берега во время отлива для обновления карт ваттов и баров (ИК "
+"в псевдоцветах)"
+
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "Снимки с imagico.de: побережье Северного моря, 2016"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Саксония: самые новые аэрофотоснимки"
@@ -17244,9 +17407,15 @@ msgstr "Мюнхен: новые аэрофотоснимки 60см"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "Снимки с imagico.de: Касигианнгуит"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr "Icebridge DMS - снимки поселения (смещение может быть неверным)"
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "Снимки с imagico.de: авиабаза Туле"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr "Снимки Icebridge DMS (смещение может быть неверным)"
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17255,6 +17424,11 @@ msgstr ""
 "2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+"Аэроснимки Icebridge DMS с авиабазы Туле (смещение может быть неверным)"
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт в сентябре 2015"
@@ -17266,15 +17440,34 @@ msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "Снимки с imagico.de: мозаика Гренландии"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr "Landsat - мозаика Гренландии (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "Снимки с imagico.de:  Landsat не в надире (май 2013)"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr "Снимки с imagico.de: Landsat не в надире (июль 2016)"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "Снимки с imagico.de: север Гренландии (ASTER)"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+"Собрано в основном из снимков ASTER 2012, некоторые снимки 2005 г. в "
+"основном на северо-востоке (естественные цвета с восстановленным синим "
+"каналом)"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Снимки с дрона (Гаити)"
 
@@ -17335,18 +17528,41 @@ msgstr "Венгрия: отмывка рельефа"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "Снимки с imagico.de: восток Исландии"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr "Отсутствующие островки и грубая береговая линия (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "Снимки с imagico.de: Качский Ранн"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+"Различия суши/воды которые трудно правильно картографировать на основе "
+"снимков Bing/Mapbox (ИК псевдоцвета)"
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "Снимки с imagico.de: юго-восток Сулавеси"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+"Отсутствующие острова и грубая береговая линия из-за облачности в Bing, "
+"озера также можно дополнительно детализировать (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "Снимки с imagico.de: водохранилище Бакун"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr "Отсутствующее в старых снимках до 2011 г. (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "Снимки с imagico.de: Батам"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr "Отсутствующие  в OSM острова (естественные цвета)"
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ирландия, British War Office 1:25000 GSGS 3906"
 
@@ -17410,18 +17626,29 @@ msgstr "Южный Тироль - ортофото 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Южный Тироль ортофото 2011 (высокое разрешение)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Южный Тироль - ортофото 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Южный Тироль - топокарта"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr "Топографическая базовая карта Южного Тироля"
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Япония: ортоснимки GSI"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "Снимки с imagico.de: гора Кения, 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr "Новые снимки для картографирования ледников (естественные цвета)"
+
 msgid "USSR - Latvia"
 msgstr "СССР - Латвия"
 
@@ -17455,28 +17682,37 @@ msgstr "Luxembourg Inspire: водная карта"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Дельта Нигера, окт. 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "Аэрофотоснимки PDOK 25 см (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr "Аэрофотоснимки PDOK 25 см"
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "Аэрофотоснимки PDOK 25 см (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr "LINZ NZ - аэрофотоснимки"
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr "LINZ NZ Topo50 - бессеточные карты"
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Шпицберген - ортофото 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "Снимки с imagico.de: мозаика Шпицбергена"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
-msgstr ""
-"Sentinel-2 мозаика Шпицбергена, в основном Sentinel-2 2016 каналы 234 (true "
-"color)"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
+msgstr "Sentinel-2 - мозаика Шпицбергена (естественные цвета)"
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "Снимки с imagico.de: западная часть Каракорума"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+"Приблизительно отображает минимальный снежный покров, поэтому хорошо "
+"подходит для картографирования ледников (естественные цвета)"
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014"
 
@@ -17486,15 +17722,33 @@ msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014 (
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr "Снимки с imagico.de: Панамский канал - тихоокеанская сторона"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+"Новые шлюзы с меньшим количеством облаков, чем на снимках Sentinel-2 - "
+"проверьте привязку снимков (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "Снимки с imagico.de: Панамский канал"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr "Снимки новых шлюзов (частично облачные) (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "Снимки с imagico.de: Ванатинаи"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+"Грубая линия побережья из-за облачного покрова в Bing/Mapbox (естественные "
+"цвета)"
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "Снимки с imagico.de: Новая Ирландия"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "Снимки с imagico.de: Коропуна"
 
@@ -17504,6 +17758,9 @@ msgstr ""
 "Снимки с imagico.de: хребет Кордильера-де-Вильканота и ледниковая шапка "
 "Келькайя"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr "Плохие и устаревшие снимки в других источниках (естественные цвета)"
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr "Пангасинан/Булакан (Филиппины HiRes)"
 
@@ -17642,26 +17899,39 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "Снимки с imagico.de: Керченский пролив"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr "Состояние постройки моста в августе 2016 (естественные цвета)"
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "Снимки с imagico.de: побережье Печорского моря"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+"Снимки Sentinel-2 берега Печорского моря осенью 2016 (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "Снимки с imagico.de: остров Ушакова, август 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr "Новые летние снимки с малой облачностью (естественные цвета)"
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr "Снимки с imagico.de: Северный и Полярный Урал, август 2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+"Новые летние снимки с малой облачностью - внимание: не весь видимый снег "
+"является ледниками  (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "Снимки с imagico.de: космодром Восточный"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "Снимки с imagico.de: побережье Печорского моря"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
-msgstr ""
-"каналы 234 (true color), снимки Sentinel-2 побережья Печорского моря, осень "
-"2016"
+msgid "Recent image showing newest features (true color)"
+msgstr "Недавние снимки с самыми новыми объектами (естественные цвета)"
 
 msgid "Freemap.sk Car"
 msgstr "Freemap.sk (автомобильная)"
@@ -17687,18 +17957,40 @@ msgstr "RABA-KGZ: Словения - области застройки"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Городской округ Кейптаун: аэросъёмка 2013"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+"Только для использования в OpenStreetMap. Аэрофотоснимки муниципальной "
+"области Кейп-Тауна. Размер пикселя на местности (GSD) - 12 см"
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Кейптаун, аэрофотосъёмка 2015"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+"Только для использования в OpenStreetMap. Аэрофотоснимки муниципальной "
+"области Кейп-Тауна. Размер пикселя на местности (GSD) - 8 см"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Южная Африка CD:NGI аэрофотосъёмка"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "Снимки с imagico.de: остров Лескова (ASTER)"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+"Отсутствующее в других источниках снимков (естественные цвета с "
+"восстановленным синим каналом)"
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "Снимки с imagico.de: остров Скотта"
 
+msgid "Missing in other image sources (true color)"
+msgstr "Отсутствующее в других источниках снимков (естественные цвета)"
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "Снимки с imagico.de: остров Лескова (Landsat)"
 
@@ -17732,6 +18024,10 @@ msgstr "GRAFCAN Express - Канарские острова"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "Снимки с imagico.de: Адамов Мост"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+"Пополняющие неполное покрытие в других источниках (естественные цвета)"
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Кантон Аргау 25см (AGIS 2011)"
 
@@ -17810,12 +18106,24 @@ msgstr "Кантон Базель - ландшафт 10см (2015)"
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr "Снимки с imagico.de: Центральные Альпы,  конец сентября 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+"Новые снимки для обрисовки ледников (естественные цвета). Учтите наличие "
+"свежего снега на больших высотах."
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Тайвань - e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Тайвань - e-Map Open Data (с изолиниями)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+"Электронная карта из Национального центра землеустройства и картографии "
+"Тайваня (NLSC)"
+
 msgid "Taiwan Village Boundaries"
 msgstr "Тайвань - границы деревень"
 
@@ -17876,11 +18184,11 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "Снимки с imagico.de: Аляскинский хребет"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
-"Каналы 234 (true color), последние летние снимки Аляскинского хребта для "
-"картирования природных особенностей"
+"Недавние летние снимки Аляскинского хребта для картографирования природных "
+"объектов (естественные цвета)"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "NJ 2015 аэрофотосъёмка (инфракрасная)"
@@ -17910,6 +18218,8 @@ msgid ""
 "Public domain aerial imagery taken in May/June 2013 from San Juan County, "
 "WA. Resolution is 9 inch."
 msgstr ""
+"Общедоступные (public domain) аэрофотоснимки, сделанные в мае-июне 2013 в "
+"округе Сан-Хуан (Вашингтон). Разрешение 9 дюймов."
 
 msgid "WA 2016 aerial imagery for San Juan County"
 msgstr "WA округ Сан-Хуан, аэрофотосъёмка 2016"
@@ -17928,6 +18238,8 @@ msgid ""
 "Public domain street and address data from the San Juan County, WA. Updated "
 "at least quarterly."
 msgstr ""
+"Общедоступные (public domain) данные об улицах и адресах в округе Сан-Хуан "
+"(Вашингтон). Обновляются по меньшей мере ежеквартально."
 
 msgid "Texas Orthophoto"
 msgstr "Ортофото Техаса"
@@ -17961,9 +18273,25 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Делавэр - ортофото 2012"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+"Этот набор данных состоит из ортоснимков с разрешающей способностью 0.3 м в "
+"естественных цветах  и ближней ИК-области (4 диапазона - R, G, B, IR), "
+"охватывающих  округи Нью-Касл, Кент и Сассекс штата Делавэр."
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "Снимки с imagico.de: горы Рувензори"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+"Недавние снимки большинства оставшихся ледников гор Рувензори (ИК в "
+"псевдоцветах)"
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "Снимки с imagico.de: горы Рувензори, 2016"
 
@@ -18015,240 +18343,770 @@ msgstr "NLS - изд. Bartholomew, полудюймовая, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans, Абердин 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Абердин (1866-1867), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans, Эйрдри 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Эйрдри (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans, Александрия 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Александрия (1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans, Аллоа 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Аллоа (1861-1862), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans, Аннан 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Аннан(1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans, Арброт 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Арброт (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans, Эр 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Эр (1855), предоставлен Национальной библиотекой Шотландии."
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans, Берик-апон-Туид 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Подробный план г. Берик-апон-Туид (1852), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans, Брихин 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Брихин (1862), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans, Бернтайленд 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Бернтайленд (1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans, Кэмпбелтаун 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Кэмпбелтон (1865), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans, Котбридж 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Котбридж (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS: планы городов, Купар 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Капар (1854), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans, Купар 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Капар (1893-1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans, Далкит 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Далкит (1852), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans, Далкит 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Далкит (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans, Дамбартон 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Дамбартон (1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans, Дамфрис 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Дамфрис (1850), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans, Дамфрис 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Дамфрис (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans, Данди 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Данди (1857-1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans, Данди 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Данди (1870-1872), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans, Данфермлин 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Данфермлин (1854), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans, Данфермлин 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Данфермлин (1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans, Эдинбург 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Эдинбург (1849-1851), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans, Эдинбург 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Эдинбург (1876-1877), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans, Эдинбург 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Эдинбург (1893-1894), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Town Plans, Эдинбург 1940-1960 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Эдинбург (1940-е - 1960-е), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans, Элгин 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Элгин (1868), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans, Фолкерк 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Фолкерк (1858-1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans, Форфар 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Форфар (1860-1861), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans, Форрес 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Форрес (1868), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans, Галашилс 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Галашилс (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans, Герван 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Герван (1857), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans, Глазго 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Глазго (1857-1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans, Глазго 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Глазго (1892-1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans, Гринок 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Гринок (1857), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans, Хаддингтон 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Хаддингтон (1853), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans, Хаддингтон 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Хаддингтон (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans, Гамильтон 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Гамильтон (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans, Хоик 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Хоик (1857-1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans, Инвернесс 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Инвернесс (1867-1868), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans, Эрвин 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Эрвин (1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans, Джедборо 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Джедборо (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans, Келсо 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Келсо (1857), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans, Килмарнок 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Килмарнок (1857-1859), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans, Керколди 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Керколди (1855), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans, Керколди 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Керколди (1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans, Керкубри 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Керкубри (1850), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans, Керкубри 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Керкубри (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans, Керкинтиллох 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Керкинтиллох (1859), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans, Кирримьюир 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Кирримьюир (1861), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans, Ланарк 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Ланарк (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans, Линлитгоу 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Линлитгоу (1856), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Plans, Мейбол 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Мейбол (1856-1857), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans, Монтроз 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Монтроз (1861-1862), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans, Масселборо 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Масселборо (1853), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans, Масселборо 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Масселборо (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans, Нэрн 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Нэрн (1867-1868), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans, Обан 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Обан (1867-1868), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Пейсли1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Пейсли (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans, Пибл 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Пиблс (1856), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans, Перт 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Перт (1860), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans, Питерхед 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Питерхед (1868), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans, Порт Глазго 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Подробный план г. Порт-Глазго (1856-1857), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans, Портобелло 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Портобелло (1893-1894), предоставлен Национальной "
+"библиотекой Шотландии."
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans, Ротсей 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Ротсей (1862-1863), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans, Селкерк 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Селкерк (1865), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans, Сент-Эндрюс 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Сент-Андрус (1854), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans, Сент-Эндрюс 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Сент-Андрус (1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans, Стерлинг 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Стерлинг (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans, Стоунхейвен 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Стонхейвен (1864), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans, Странрар 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Странрар(1847), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans, Странрар 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Странрар(1863-1877), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans, Странрар 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Странрар(1893), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans, Стратхейвен 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Подробный план г. Стратхейвен (1858), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans, Уик 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Уик (1872), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans, Уигтаун 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Уигтаун (1848), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans, Уигтаун 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+"Подробный план г. Уигтаун (1894), предоставлен Национальной библиотекой "
+"Шотландии."
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr "Недавние снимки Landsat"
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -20497,31 +21355,31 @@ msgstr "Велодорожка"
 
 msgctxt "cycleway"
 msgid "lane"
-msgstr ""
+msgstr "полоса"
 
 msgctxt "cycleway"
 msgid "track"
-msgstr ""
+msgstr "дорожка"
 
 msgctxt "cycleway"
 msgid "opposite_lane"
-msgstr ""
+msgstr "встречная полоса"
 
 msgctxt "cycleway"
 msgid "opposite_track"
-msgstr ""
+msgstr "встречная дорожка"
 
 msgctxt "cycleway"
 msgid "opposite"
-msgstr ""
+msgstr "встречная"
 
 msgctxt "cycleway"
 msgid "share_busway"
-msgstr ""
+msgstr "общая полоса с общественным транспортом"
 
 msgctxt "cycleway"
 msgid "shared_lane"
-msgstr ""
+msgstr "общая полоса с автотранспортом"
 
 msgid "Cycleway left"
 msgstr "Велодорожка слева"
@@ -24633,7 +25491,7 @@ msgid "5 Mvar"
 msgstr "5 Mvar"
 
 msgid "Power Street Cabinet"
-msgstr "Трансформаторная будка"
+msgstr "Электротехнический шкаф"
 
 msgid "Transformer Tower"
 msgstr "Трансформаторная башня"
@@ -25018,6 +25876,9 @@ msgstr "Морепродукты"
 msgid "Dairy"
 msgstr "Молочные продукты"
 
+msgid "Cheese"
+msgstr "Сыр"
+
 msgid "Deli (Fine Food)"
 msgstr "Деликатесы"
 
@@ -27324,6 +28185,9 @@ msgstr "{0} должен быть положительным целым числ
 msgid "unusual value of {0}"
 msgstr "необычное значение {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr "{0} должно быть числом в метрах, без единиц измерения"
+
 msgid "relation without type"
 msgstr "отношение без типа"
 
@@ -28343,32 +29207,36 @@ msgid "Go forward"
 msgstr "Вперёд"
 
 msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Какие слои с изображениями вы хотите импортировать в слой Mapillary?"
 
 msgid "Import"
 msgstr "Импортировать"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr "Не удалось импортировать геотегированный снимок в слой Mapillary!"
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
+"Из какого источника вы хотите импортировать изображения в слой Mapillary?"
 
 msgid "There are currently no layers with geotagged images!"
-msgstr ""
+msgstr "Нет слоёв с геопривязанными изображениями!"
 
 msgid "Images from my file system"
-msgstr ""
+msgstr "Изображения из моей файловой системы"
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Выберите изображения, которые вы хотите импортировать"
 
 msgid "All images in a directory"
-msgstr ""
+msgstr "Все изображения в каталоге"
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Выберите каталог для импорта изображений"
 
 msgid "From existing image layer"
-msgstr ""
+msgstr "Из существующего слоя изображений"
 
 msgid "Import exception"
 msgstr ""
@@ -28423,7 +29291,7 @@ msgstr ""
 "Показывает подробную информацию о текущем выделенном снимке Mapillary"
 
 msgid "Show detections on top of image"
-msgstr ""
+msgstr "Показывать обнаруженные поверх снимка"
 
 msgid "View in browser"
 msgstr "Открыть в браузере"
@@ -28435,7 +29303,7 @@ msgid "Add Mapillary tag"
 msgstr "Добавить тег Mapillary"
 
 msgid "Image detections"
-msgstr ""
+msgstr "Обнаружение знаков"
 
 msgid "Image actions"
 msgstr "Действия со снимком"
@@ -28447,7 +29315,7 @@ msgid "Sequence key"
 msgstr "Идентификатор последовательности"
 
 msgid "{0} detections"
-msgstr ""
+msgstr "Обнаружено: {0}"
 
 msgid "image has no key"
 msgstr "у снимка нет идентификатора"
@@ -29341,6 +30209,37 @@ msgstr ""
 "В отладочном режиме изображения будут записываться для каждого шага "
 "обработки."
 
+msgid "Please choose the address type"
+msgstr "Выберите тип адреса"
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+"<html>Невозможно автоматически определить, является <strong>{0}</strong> "
+"(часть адреса {0} {1}, {2} {3}) названием <strong>улицы</strong> или "
+"<strong>места</strong>. Если <strong>{0}</strong> — это улица, выберите ниже "
+"\"улица\". Если же <strong>{0}</strong> — это название села, деревни, "
+"территориальной зоны или другого объекта, кроме улицы, выберите "
+"\"место\".</html>"
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr "<html>{0} — <strong>улица</strong>.</html>"
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr "<html>{0} — <strong>место</strong>.</html>"
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+"<html>Запомнить мой выбор для <strong>{0}</strong> в {1} {2} на этот "
+"сеанс.</html>"
+
 msgid "Fetch Address"
 msgstr "Получить адрес"
 
@@ -29350,6 +30249,9 @@ msgstr "Austria Address Helper<br>Пожалуйста, выберите тол
 msgid "Austria Address Helper"
 msgstr "Austria Address Helper"
 
+msgid "No address type selected. Aborting."
+msgstr "Не выбран тип адреса. Прерывание."
+
 msgid "Successfully added address to selected object:"
 msgstr "Успешно добавлен адрес к выделенному объекту:"
 
@@ -30172,7 +31074,7 @@ msgid "Finding matches"
 msgstr ""
 
 msgid "Sorting scores"
-msgstr ""
+msgstr "Сортировка баллов"
 
 msgid "Discarding inferior matches"
 msgstr ""
@@ -30194,13 +31096,15 @@ msgstr[2] "Добавлено {0} объектов к целевому слою"
 
 msgid "Moved {0} conflation match to unmatched list"
 msgid_plural "Moved {0} conflation matches to unmatched list"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} совпадение перенесено в список не совпадающих"
+msgstr[1] "{0} совпадения перенесены в список не совпадающих"
+msgstr[2] "{0} совпадений перенесены в список не совпадающих"
 
 msgid "Delete {0} conflation match"
 msgid_plural "Delete {0} conflation matches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Удалить {0} совпадение"
+msgstr[1] "Удалить {0} совпадения"
+msgstr[2] "Удалить {0} совпадений"
 
 msgid "Remove {0} unmatched objects"
 msgstr "Удалить {0} несовпадающих объектов"
@@ -30339,10 +31243,10 @@ msgid "Merging"
 msgstr "Слияние"
 
 msgid "Reference:"
-msgstr "Ссылка:"
+msgstr "Справочный:"
 
 msgid "Subject:"
-msgstr ""
+msgstr "Целевой:"
 
 msgid "Selections must be made for both reference and subject."
 msgstr "Выделение должно быть сделано и на справочном и на целевом слое"
@@ -30375,7 +31279,7 @@ msgid "Freeze reference selection"
 msgstr "Заблокировать выделение в справочном слое"
 
 msgid "Reference and subject sets should better be different."
-msgstr ""
+msgstr "Справочный и целевой наборы данных целесообразнее выбрать разные."
 
 msgid "Relations are not supported yet, please do not select them."
 msgstr "Отношения пока не поддерживаются. Пожалуйста, не выбирайте их."
@@ -34185,24 +35089,6 @@ msgstr "Знак {0}"
 msgid "Additional sign {0}"
 msgstr "Дополнительный знак {0}"
 
-msgid "Edit relation"
-msgstr "Редактировать отношение"
-
-msgid "Edit relations"
-msgstr "Редактировать отношения"
-
-msgid "No relation is selected"
-msgstr "Нет выделенного отношения"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить точку ''{0}'' в позиции {1} из отношения ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить линию ''{0}'' в позиции {1} из отношения ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Удалить отношение ''{0}'' в позиции {1} из отношения ''{2}''"
-
 msgid "routing active route"
 msgstr "Маршрутизация: активный маршрут"
 
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 3838b1e..81371a6 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-27 18:57+0000\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-24 20:30+0000\n"
 "Last-Translator: aceman444 <Unknown>\n"
 "Language-Team: Slovak <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:07+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:08+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: sk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -67,13 +67,13 @@ msgid "Help"
 msgstr "Pomocník"
 
 msgid "Initializing internal boundaries data"
-msgstr "Inicializujú sa interné údaje hraníc"
+msgstr "Inicializujem interné údaje hraníc"
 
 msgid "Initializing OSM API"
 msgstr "Inicializujem OSM API"
 
 msgid "Initializing internal traffic data"
-msgstr "Inicializujú sa interné údaje cestnej premávky"
+msgstr "Inicializujem interné údaje hraníc"
 
 msgid "Initializing validator"
 msgstr "Inicializujem validátor"
@@ -85,7 +85,7 @@ msgid "Initializing map styles"
 msgstr "Inicializujem mapové štýly"
 
 msgid "Loading imagery preferences"
-msgstr "Načítavajú sa predvoľby mapových podkladov"
+msgstr "Načítavam predvoľby mapových podkladov"
 
 msgid "Updating user interface"
 msgstr "Aktualizujem používateľské rozhranie"
@@ -5851,6 +5851,25 @@ msgstr[0] "Ich verzia ({0} položiek)"
 msgstr[1] "Ich verzia ({0} položka)"
 msgstr[2] "Ich verzia ({0} položky)"
 
+msgid "My version (local dataset)"
+msgstr "Moja verzia (miestna(local) dátová sada)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Vlastnosti v mojej dátovej sade, t.j. lokálna dátová sada"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Vlastnosti v spojených elementoch. Budú nahradené vlastnosťami v mojich "
+"elementoch, keď rozhodnutie o spojenie bude aplikované."
+
+msgid "Their version (server dataset)"
+msgstr "Ich(their) verzia (serverová dátová sada)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Vlastnosti v ich dátovej sade, t.j. dátová sada na serveri"
+
 msgid "My with Their"
 msgstr "Môj s Ich"
 
@@ -5940,28 +5959,6 @@ msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Vlastnosti v mojej dátovej sade, t.j. lokálna dátová sada"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Vlastnosti v spojených elementoch. Budú nahradené vlastnosťami v mojich "
-"elementoch, keď rozhodnutie o spojenie bude aplikované."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Vlastnosti v ich dátovej sade, t.j. dátová sada na serveri"
-
-msgid "Coordinates:"
-msgstr "Súradnice:"
-
-msgid "Deleted State:"
-msgstr "Vymazaný stav:"
-
-msgid "Referenced by:"
-msgstr "Odkazujúci na:"
-
 msgid "(none)"
 msgstr "(žiadny)"
 
@@ -5971,6 +5968,15 @@ msgstr "zmazané"
 msgid "not deleted"
 msgstr "nevymazaný"
 
+msgid "Deleted State:"
+msgstr "Vymazaný stav:"
+
+msgid "Coordinates:"
+msgstr "Súradnice:"
+
+msgid "Referenced by:"
+msgstr "Odkazujúci na:"
+
 msgid "Keep my coordinates"
 msgstr "Držím súradnice"
 
@@ -6017,12 +6023,6 @@ msgstr "Kľúč"
 msgid "Value"
 msgstr "Hodnota"
 
-msgid "My version (local dataset)"
-msgstr "Moja verzia (miestna(local) dátová sada)"
-
-msgid "Their version (server dataset)"
-msgstr "Ich(their) verzia (serverová dátová sada)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Držať vybrané páry kľúče/hodnoty z miestnej(local) dátovej sady"
 
@@ -9681,7 +9681,7 @@ msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr "Zmenový súbor je <strong>stále otvorený</strong> po tomto nahratí"
 
 msgid "configure changeset"
-msgstr "konfiguravať zmenový súbor"
+msgstr "konfigurovať zmenový súbor"
 
 msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
 msgid_plural ""
@@ -11152,9 +11152,6 @@ msgstr "Zatvorte dialóg a zrušiť povolenie"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Zatvorte dialóg a prijmite autorizačný prístup"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Nepodarilo sa zrušiť bežiacu OAuth operáciu"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Získavam OAuth žiadosť prístupu z ''{0}''"
 
@@ -11176,7 +11173,7 @@ msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Povoľujem OAuth žiadosť prístupu ''{0}'' na stránkach OSM ..."
 
 msgid "Initializing a session at the OSM website..."
-msgstr "Inicializojem sedenie na internetovej stránke OSM ..."
+msgstr "Inicializujem sedenie na internetovej stránke OSM ..."
 
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Overovanie sedenia pre používateľa ''{0}'' ..."
@@ -13006,8 +13003,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Švajčiarsko)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (bez lokálnych opráv)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14432,10 +14429,17 @@ msgstr "Čítanie bolo zrušené"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+"Chýbajú povinné atribúty na elemente \"bounds\". Obdržané hodnoty "
+"minlon=\"{0}\",minlat=\"{1}\",maxlon=\"{2}\",maxlat=\"{3}\", origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Chýbajú povinné atribúty pre element''hranice''. Obdržané hodnoty sú minlon "
-"=''{0}'',minlat =''{1}'',maxlon =''{3}'',maxlat =''{4}'', pôvod =''{5}''."
+"Neplatná hodnota pre atribúty \"lat\", \"lon\" na bode s ID {0}. Obdržané "
+"hodnoty sú \"{1}\", \"{2}\"."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Vymazaná cesta {0} obsahuje body"
@@ -15819,9 +15823,6 @@ msgstr "Otvára sa URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL neobsahuje {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "rezervované"
-
 msgid "Outdated Java version"
 msgstr "Zastaralá verzia Java"
 
@@ -15831,9 +15832,6 @@ msgstr "Aktualizujte Java"
 msgid "You are running version {0} of Java."
 msgstr "Používate Java verziu {0}."
 
-msgid "April 2015"
-msgstr "Apríl 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15848,9 +15846,18 @@ msgstr ""
 "JOSM čoskoro prestane fungovať s touro verziou. Odporúčame aktualizovať na "
 "Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+"Môžete naraziť na vážne chyby v Jave; odporúčame aktualizovať na Java {0}."
+
 msgid "Would you like to update now ?"
 msgstr "Prajete si aktualizovať teraz?"
 
+msgid "reserved"
+msgstr "rezervované"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16479,6 +16486,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "MapBox Satelit"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "DigitalGlobe Prémiové snímky"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "DigitalGlobe Štandardné snímky"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16506,6 +16519,9 @@ msgstr "OpenStreetMap (Nemecký štýl)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Stopy"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Verejné stopy GPS odoslané na OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Hromadná doprava (ÖPNV)"
 
@@ -16536,6 +16552,9 @@ msgstr "Cyklistická a bežecká heatmap Strava"
 msgid "Locator Overlay"
 msgstr "Prekryvná vrstva Locator"
 
+msgid "Shows major features to help orient you."
+msgstr "Zobrazuje dôležité objekty na pomoc pri orientácii."
+
 msgid "QA No Address"
 msgstr "QA Bez adries"
 
@@ -16584,9 +16603,19 @@ msgstr "OSM Inspector: Pobrežie (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de OSM obrázky pre mapovanie: Prokletije Mountains"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de OSM obrázky pre mapovanie: Južné transantarktické hory"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de OSM obrázky pre mapovanie: Pensacola Mountains"
 
@@ -16594,15 +16623,14 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 "imagico.de OSM obrázky pre mapovanie: Elephant Island/Clarence Island"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
-"Snímky zo Sentinel-2 kanály 234 (skutočné farby), Snímky zo Sentinel-2 z "
-"Enderby Land a Kemp Coast, začiatok 2017"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Argentína (TMS)"
@@ -16643,15 +16671,30 @@ msgstr "LPI NSW Administratívne hranice chránených oblastí NPWS"
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de OSM obrázky pre mapovanie: Northwest Heard Island"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de OSM obrázky pre mapovanie: Heard Island coast"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16667,6 +16710,12 @@ msgstr "Tiris: DGM (Povrchový model)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: vrstevnice"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: ortofoto"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: ortofoto infračervené"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Viedeň: Viacúčelová mapa (všeobecné použitie)"
 
@@ -16772,9 +16821,15 @@ msgstr "Benin: Cotonou Pleiade 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de OSM obrázky pre mapovanie: Cotonou"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de OSM obrázky pre mapovanie: Bouvet Island"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16784,6 +16839,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Distrito Federal"
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr "Rio Mosaic 2013"
 
@@ -16868,9 +16926,36 @@ msgstr "Alagoas Litoral 2006"
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Trecho Rodoviario"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Hydrografia"
 
@@ -16886,31 +16971,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Najnovšie snímky juhozápadnej Britskej Kolumbie z Landsat"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna cesty"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Devon Island coast"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de OSM obrázky pre mapovanie: Northern Ellesmere Island"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de OSM obrázky pre mapovanie: Fogo, Cape Verde"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de OSM obrázky pre mapovanie: Isla Londonderry"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de OSM obrázky pre mapovanie: Volcán Calbuco"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Český CUZK:KM"
 
@@ -16929,14 +17043,14 @@ msgstr "Praha IPR najnovšie ortofoto"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Praha IPR ortofoto s riedkou vegetáciou"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Dánsko)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE Terræn Skyggekort (40 cm)"
@@ -16944,21 +17058,31 @@ msgstr "SDFE Terræn Skyggekort (40 cm)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE Overflade Skyggekort (40 cm)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dánsko)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dánsko)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de OSM obrázky pre mapovanie: El Altar"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
@@ -16977,6 +17101,9 @@ msgstr "Estónsko, Lesníctvo (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -16989,6 +17116,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
 
@@ -17120,21 +17250,24 @@ msgstr ""
 "prílivové oblasti"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de OSM obrázky pre mapovanie: Severné Nemecko západné pobrežné "
 "prílivové oblasti (infračervené)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
-"234 kanálov (skutočné farby), aktuálne snímky z odlivu na pobreží pre "
-"spresnenie zaplavovaných oblastí"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Dolné Sasko najnovšie letecké snímky"
@@ -17166,15 +17299,25 @@ msgstr "Mníchov najnovšie letecké snímky 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de OSM obrázky pre mapovanie: Qasigiannguit"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de OSM obrázky pre mapovanie: Thule Air Base"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17186,15 +17329,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de OSM obrázky pre mapovanie: Greenland mosaic"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de OSM obrázky pre mapovanie: May 2013 off-nadir Landsat"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de OSM obrázky pre mapovanie: Northern Greenland ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Snímky automatických lietadiel (Haiti)"
 
@@ -17255,18 +17414,37 @@ msgstr "Tieňované svahy Maďarsko"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Iceland"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de OSM obrázky pre mapovanie: Rann of Kutch"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de OSM obrázky pre mapovanie: Southeastern Sulawesi"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de OSM obrázky pre mapovanie: Bakun Reservoir"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de OSM obrázky pre mapovanie: Batam"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Office 1:25k GSGS 3906"
 
@@ -17330,18 +17508,29 @@ msgstr "Južné Tirolsko Ortofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Južné Tirolsko Ortofoto 2011 (vysoké rozlíšenie)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Južné Tirolsko Ortofoto 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Južné Tirolsko, topografická mapa"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Japonsko GSI ortofoto"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "ZSSR - Lotyšsko"
 
@@ -17375,26 +17564,35 @@ msgstr "Luxembourg Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta Nigeru Okt 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Svalbard - Ortofoto 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de OSM obrázky pre mapovanie: Western Karakoram"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Pásmo Gazy - Pléiades - 2014/07/06"
 
@@ -17404,15 +17602,29 @@ msgstr "Pásmo Gazy - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de OSM obrázky pre mapovanie: Panama Canal"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de OSM obrázky pre mapovanie: Vanatinai"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de OSM obrázky pre mapovanie: New Ireland"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -17422,6 +17634,9 @@ msgstr ""
 "imagico.de OSM obrázky pre mapovanie: Willkanuta Mountains and Quelccaya Ice "
 "Cap"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17560,23 +17775,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17603,18 +17830,34 @@ msgstr "RABA-KGZ: Slovinsko zastavané plochy"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Kapské mesto 2013 Aerial"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Kapské mesto 2015 Letecké snímky"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Južná Afrika CD:NGI Letecké"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de OSM obrázky pre mapovanie: Scott Island"
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island Landsat"
 
@@ -17648,6 +17891,9 @@ msgstr "GRAFCAN Express - Kanárske ostrovy"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17726,12 +17972,20 @@ msgstr "Kanton Basel-Landschaft 10cm (2015)"
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Taiwan e-Map Open Data (s vrstevnicami)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "Taiwan Hranice dedín"
 
@@ -17787,8 +18041,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de OSM obrázky pre mapovanie: Alaska Range"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17865,9 +18119,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr "Delaware 2012 Ortofoto"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de OSM obrázky pre mapovanie: Rwenzori Mountains"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17919,240 +18184,615 @@ msgstr "NLS - Bartholomew Half Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Plány miest, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Plány miest, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Plány miest, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Plány miest, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Plány miest, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Plány miest, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Plány miest, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Plány miest, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Plány miest, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Plány miest, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Plány miest, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Plány miest, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Plány miest, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Plány miest, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Plány miest, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Plány miest, Dalkeith 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Plány miest, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Plány miest, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Plány miest, Dumfries 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Plány miest, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Plány miest, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Plány miest, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Plány miest, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Plány miest, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Plány miest, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Plány miest, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Plány miest, Edinburgh 1940s-1960s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Plány miest, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Plány miest, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Plány miest, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Plány miest, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Plány miest, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Plány miest, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Plány miest, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Plány miest, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Plány miest, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Plány miest, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Plány miest, Haddington 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Plány miest, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Plány miest, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Plány miest, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Plány miest, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Plány miest, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Plány miest, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Plány miest, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Plány miest, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Plány miest, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Plány miest, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Plány miest, Kirkcudbright 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Plány miest, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Plány miest, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Plány miest, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Plány miest, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Plány miest, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Plány miest, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Plány miest, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Plány miest, Musselburgh 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Plány miest, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Plány miest, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Paisley 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Plány miest, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Plány miest, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Plány miest, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Plány miest, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Plány miest, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Plány miest, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Plány miest, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Plány miest, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Plány miest, St Andrews 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Plány miest, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Plány miest, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Plány miest, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Plány miest, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Plány miest, Stranraer 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Plány miest, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Plány miest, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Plány miest, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Plány miest, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -21582,7 +22222,7 @@ msgid "Wash"
 msgstr "Umývačka"
 
 msgid "Self Service"
-msgstr ""
+msgstr "Samoobsluha"
 
 msgid "Car Dealer"
 msgstr "Predajca automobilov"
@@ -24898,6 +25538,9 @@ msgstr "Morské špeciality"
 msgid "Dairy"
 msgstr "Mliečne výrobky"
 
+msgid "Cheese"
+msgstr "Syry"
+
 msgid "Deli (Fine Food)"
 msgstr "Špeciality"
 
@@ -26376,19 +27019,19 @@ msgid "Label point"
 msgstr "Miesto pre menovku"
 
 msgid "Outline of building"
-msgstr ""
+msgstr "Obrys budovy"
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Vnútorný segment"
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Hrebeň strechy"
 
 msgid "Roof edge"
-msgstr ""
+msgstr "Hrana strechy"
 
 msgid "Building level"
-msgstr ""
+msgstr "Poschodie budovy"
 
 msgid "Site"
 msgstr "Areál (site)"
@@ -27198,6 +27841,9 @@ msgstr "{0} musí byť kladné celé číslo"
 msgid "unusual value of {0}"
 msgstr "nezvyčajná hodnota {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "relácia bez \"type\""
 
@@ -28201,6 +28847,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importovať"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -29066,6 +29715,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -29075,6 +29747,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33725,24 +34400,6 @@ msgstr "Dopravná značka {0}"
 msgid "Additional sign {0}"
 msgstr "Doplňujúca dopravná značka {0}"
 
-msgid "Edit relation"
-msgstr "Upraviť reláciu"
-
-msgid "Edit relations"
-msgstr "Upraviť relácie"
-
-msgid "No relation is selected"
-msgstr "Nie je vybraná žiadna relácia"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odobrať bod ''{0}'' v mieste {1} z relácie ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odobrať cestu ''{0}'' v mieste {1} z relácie ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Odobrať reláciu ''{0}'' v mieste {1} z relácie ''{2}''"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 18042cd..2f4262f 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-11-07 17:38+0000\n"
 "Last-Translator: Joško Horvat <Unknown>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:07+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:08+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: sl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5421,6 +5421,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5503,33 +5520,22 @@ msgstr "Vozlišče"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgid "deleted"
+msgstr "izbrisano"
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "deleted"
-msgstr "izbrisano"
-
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5577,12 +5583,6 @@ msgstr "Ključ"
 msgid "Value"
 msgstr "Vrednost"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10166,9 +10166,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11867,7 +11864,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13142,7 +13139,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14265,9 +14267,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14277,9 +14276,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14290,9 +14286,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14875,6 +14879,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14902,6 +14912,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14932,6 +14945,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14980,21 +14996,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15036,15 +15063,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15060,6 +15102,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15165,9 +15213,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15177,6 +15231,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15261,9 +15318,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15279,31 +15363,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15322,13 +15435,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15337,21 +15450,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15370,6 +15493,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15382,6 +15508,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15509,16 +15638,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15551,15 +15685,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15571,15 +15715,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15640,18 +15800,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15715,18 +15894,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15760,26 +15950,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15789,15 +15988,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15805,6 +16018,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15943,23 +16159,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15986,18 +16214,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16031,6 +16275,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16109,12 +16356,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16170,8 +16425,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16195,345 +16450,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23119,6 +23760,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25364,6 +26008,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26336,6 +26983,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27188,6 +27838,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27197,6 +27870,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31736,24 +32412,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 93317bd..5d18f01 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-11-04 19:43+0000\n"
 "Last-Translator: StefanPrifti <Unknown>\n"
 "Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 04:35+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index b8fd14c..0273ceb 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-02-01 15:30+0000\n"
 "Last-Translator: Slobodan Simić <Unknown>\n"
 "Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:06+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:07+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: sr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5392,6 +5392,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5474,33 +5491,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5548,12 +5554,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10118,9 +10118,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11817,7 +11814,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13086,7 +13083,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14203,9 +14205,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14215,9 +14214,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14228,9 +14224,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14813,6 +14817,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14840,6 +14850,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14870,6 +14883,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14918,21 +14934,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14974,15 +15001,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14998,6 +15040,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15103,9 +15151,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15115,6 +15169,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15199,9 +15256,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15217,31 +15301,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15260,13 +15373,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15275,21 +15388,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15308,6 +15431,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15320,6 +15446,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15447,16 +15576,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15489,15 +15623,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15509,15 +15653,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15578,18 +15738,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15653,18 +15832,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15698,26 +15888,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15727,15 +15926,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15743,6 +15956,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15881,23 +16097,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15924,18 +16152,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15969,6 +16213,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16047,12 +16294,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16108,8 +16363,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16133,345 +16388,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23057,6 +23698,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25302,6 +25946,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26274,6 +26921,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27126,6 +27776,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27135,6 +27808,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31672,24 +32348,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index fd60215..28e8b97 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-22 12:40+0000\n"
 "Last-Translator: Erik <Unknown>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:08+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:10+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: sv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5706,6 +5706,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr "Min version (lokalt dataset)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr "Deras version (server dataset)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr "Min version med deras"
 
@@ -5790,35 +5807,24 @@ msgstr "Nod"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
+msgid "(none)"
 msgstr ""
 
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "deleted"
+msgstr "raderad"
+
+msgid "not deleted"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "Deleted State:"
 msgstr ""
 
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-msgid "Deleted State:"
-msgstr ""
-
 msgid "Referenced by:"
 msgstr ""
 
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
-msgstr "raderad"
-
-msgid "not deleted"
-msgstr ""
-
 msgid "Keep my coordinates"
 msgstr "Behåll mina koordinater"
 
@@ -5864,12 +5870,6 @@ msgstr "Nyckel"
 msgid "Value"
 msgstr "Värde"
 
-msgid "My version (local dataset)"
-msgstr "Min version (lokalt dataset)"
-
-msgid "Their version (server dataset)"
-msgstr "Deras version (server dataset)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10573,9 +10573,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -12320,7 +12317,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13608,7 +13605,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14813,9 +14815,6 @@ msgstr "Öppnar URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr "reserverad"
-
 msgid "Outdated Java version"
 msgstr "Föråldrad Java-version"
 
@@ -14825,9 +14824,6 @@ msgstr "Uppdatera Java"
 msgid "You are running version {0} of Java."
 msgstr "Du kör version {0} av Java."
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14842,9 +14838,17 @@ msgstr ""
 "JOSM kommer snart att sluta fungera med den här versionen; vi rekommenderar "
 "starkt att du uppdaterar till Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Vill du uppdatera nu?"
 
+msgid "reserved"
+msgstr "reserverad"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15433,6 +15437,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -15460,6 +15470,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -15490,6 +15503,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15538,21 +15554,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15594,15 +15621,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15618,6 +15660,12 @@ msgstr "Tiris: DOM (Surface model)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15723,9 +15771,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15735,6 +15789,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15819,9 +15876,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15837,31 +15921,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15880,13 +15993,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15895,21 +16008,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15928,6 +16051,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15940,6 +16066,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -16067,16 +16196,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16109,15 +16243,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16129,15 +16273,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -16198,18 +16358,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -16273,18 +16452,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -16318,26 +16508,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -16347,15 +16546,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16363,6 +16576,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -16501,23 +16717,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16544,18 +16772,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16589,6 +16833,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16667,12 +16914,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16728,8 +16983,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16804,9 +17059,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -16858,240 +17124,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23703,6 +24344,9 @@ msgstr "Skaldjur"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25961,6 +26605,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26933,6 +27580,9 @@ msgstr ""
 msgid "Import"
 msgstr "Importera"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27785,6 +28435,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27794,6 +28467,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -32371,24 +33047,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr "Redigera relation"
-
-msgid "Edit relations"
-msgstr "Redigera relationer"
-
-msgid "No relation is selected"
-msgstr "Ingen relation är vald"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Ta bort noden ''{0}'' på position {1} från relationen ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Ta bort sträcka ''{0}'' vid position {1} från relation ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Ta bort relationen ''{0}'' på position {1} från relationen ''{2}''"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 1a7ec4f..4f6c893 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-10-28 15:55+0000\n"
 "Last-Translator: நவலடி <navaladi at gmail.com>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:09+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:10+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
 "X-Poedit-Language: Tamil\n"
@@ -5427,6 +5427,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5509,33 +5526,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5583,12 +5589,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10155,9 +10155,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11854,7 +11851,7 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13123,7 +13120,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14240,9 +14242,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14252,9 +14251,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14265,9 +14261,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14850,6 +14854,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14877,6 +14887,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14907,6 +14920,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14955,21 +14971,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15011,15 +15038,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15035,6 +15077,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15140,9 +15188,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15152,6 +15206,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15236,9 +15293,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15254,31 +15338,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15297,13 +15410,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15312,21 +15425,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15345,6 +15468,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15357,6 +15483,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15484,16 +15613,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15526,15 +15660,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15546,15 +15690,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15615,18 +15775,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15690,18 +15869,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15735,26 +15925,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15764,15 +15963,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15780,6 +15993,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15918,23 +16134,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15961,18 +16189,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16006,6 +16250,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16084,12 +16331,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16145,8 +16400,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16170,345 +16425,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23094,6 +23735,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25339,6 +25983,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26311,6 +26958,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27163,6 +27813,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27172,6 +27845,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31715,24 +32391,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 9326d31..bd1b08b 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2011-05-13 08:50+0000\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:09+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:11+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: te\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/th.po b/i18n/po/th.po
index f3f653d..607b3ee 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2009-03-23 02:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:10+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:11+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: th\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 6cc2d3e..a75e349 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-02-06 01:25+0000\n"
 "Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
 "Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:11+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:12+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5456,6 +5456,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5537,33 +5554,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgid "deleted"
+msgstr "silindi"
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "deleted"
-msgstr "silindi"
-
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5611,12 +5617,6 @@ msgstr "Anahtar"
 msgid "Value"
 msgstr "Değer"
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10200,9 +10200,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11906,7 +11903,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (İsviçre)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13180,7 +13177,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14302,9 +14304,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14314,9 +14313,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14327,9 +14323,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14916,6 +14920,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14943,6 +14953,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14973,6 +14986,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -15021,21 +15037,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15077,15 +15104,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15101,6 +15143,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15206,9 +15254,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15218,6 +15272,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15302,9 +15359,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15320,31 +15404,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15363,13 +15476,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15378,21 +15491,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15411,6 +15534,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15423,6 +15549,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15550,16 +15679,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15592,15 +15726,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15612,15 +15756,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15681,18 +15841,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15756,18 +15935,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15801,26 +15991,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15830,15 +16029,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15846,6 +16059,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15984,23 +16200,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16027,18 +16255,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16072,6 +16316,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16150,12 +16397,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16211,8 +16466,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16236,345 +16491,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23160,6 +23801,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25405,6 +26049,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26377,6 +27024,9 @@ msgstr ""
 msgid "Import"
 msgstr "İçeri Al"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27229,6 +27879,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27238,6 +27911,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31789,24 +32465,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 08936da..f31dd1e 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2012-07-14 16:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:11+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:13+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index cc68162..b7cc9ba 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
-"PO-Revision-Date: 2017-04-20 14:46+0000\n"
-"Last-Translator: andygol <Unknown>\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
+"PO-Revision-Date: 2017-05-27 13:41+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:12+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:13+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: uk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5896,6 +5896,25 @@ msgstr[0] "Чужа версія ({0} запис)"
 msgstr[1] "Чужа версія ({0} записи)"
 msgstr[2] "Чужа версія ({0} записів)"
 
+msgid "My version (local dataset)"
+msgstr "Моя версія (локальний набір даних)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Властивості в моєму наборі даних, тобто локальному наборі даних"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Параметри в об’єднаному елементі. Параметри в моїх елементах будуть замінені "
+"при застосуванні об’єднання."
+
+msgid "Their version (server dataset)"
+msgstr "Чужа версія (набір даних з сервера)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Властивості в чужому наборі даних, тобто наборі даних на сервері"
+
 msgid "My with Their"
 msgstr "Мою з чужою"
 
@@ -5986,28 +6005,6 @@ msgstr ""
 "Об’єднані точки ще не заморожені. Неможливо побудувати команду розв’язання "
 "конфліктів."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Властивості в моєму наборі даних, тобто локальному наборі даних"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Параметри в об’єднаному елементі. Параметри в моїх елементах будуть замінені "
-"при застосуванні об’єднання."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Властивості в чужому наборі даних, тобто наборі даних на сервері"
-
-msgid "Coordinates:"
-msgstr "Координати:"
-
-msgid "Deleted State:"
-msgstr "Вилучений:"
-
-msgid "Referenced by:"
-msgstr "Посилається на:"
-
 msgid "(none)"
 msgstr "(відсутній)"
 
@@ -6017,6 +6014,15 @@ msgstr "вилучено"
 msgid "not deleted"
 msgstr "не вилучений"
 
+msgid "Deleted State:"
+msgstr "Вилучений:"
+
+msgid "Coordinates:"
+msgstr "Координати:"
+
+msgid "Referenced by:"
+msgstr "Посилається на:"
+
 msgid "Keep my coordinates"
 msgstr "Залишити мої координати"
 
@@ -6063,12 +6069,6 @@ msgstr "Ключ"
 msgid "Value"
 msgstr "Значення"
 
-msgid "My version (local dataset)"
-msgstr "Моя версія (локальний набір даних)"
-
-msgid "Their version (server dataset)"
-msgstr "Чужа версія (набір даних з сервера)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Залишити виділені пари ключ/значення з локального набору даних"
 
@@ -11197,9 +11197,6 @@ msgstr "Закрити діалог і скасувати авторизацію
 msgid "Close the dialog and accept the Access Token"
 msgstr "Закрити діалог і прийняти мітку доступу"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Не вдалось скасувати запуск операції OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Отримання мітки запиту OAuth з ''{0}''"
 
@@ -13060,8 +13057,8 @@ msgstr "Зона PUWG"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарська проекція"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (без локальної корекції)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr "<i>CH1903 / LV03</i>"
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Форт Marigot Гваделупа 1949"
@@ -13758,7 +13755,7 @@ msgid "Unknown requisite: {0}"
 msgstr "Невідомий запит: {0}"
 
 msgid "Unknown regexp value: {0}"
-msgstr ""
+msgstr "Невідомий регулярний вираз: {0}"
 
 msgid "Illegal member expression: {0}"
 msgstr "Некоректний вираз: {0}"
@@ -14469,10 +14466,17 @@ msgstr "Читання скасоване"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
 msgstr ""
-"Відсутні обов’язкові параметри елементу ''bounds''. Отримано "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Відсутні обовʼязкові атрибути елемента ''bounds''. Маємо: "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
+msgstr ""
+"Неприпустиме значення для атрибутів ''lat'', ''lon'' для точки з ID {0}. "
+"Маємо: ''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Вилучена лінія {0} містить точки"
@@ -15857,9 +15861,6 @@ msgstr "Відкриття URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL не містить {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "зарезервовано"
-
 msgid "Outdated Java version"
 msgstr "Застаріла версія Java"
 
@@ -15869,9 +15870,6 @@ msgstr "Оновити Java"
 msgid "You are running version {0} of Java."
 msgstr "Ви використовуєте Java версії {0}."
 
-msgid "April 2015"
-msgstr "Квітень 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15886,9 +15884,19 @@ msgstr ""
 "JOSM дуже скоро перестане працювати з цією версією; рекомендуємо оновити "
 "Java до версії {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+"Ви можете зіткнутись з неочікуваними помилками Java; ми наполегливо радимо "
+"вам оновити Java до версії {0}."
+
 msgid "Would you like to update now ?"
 msgstr "Хочете оновити зараз?"
 
+msgid "reserved"
+msgstr "зарезервовано"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -16522,6 +16530,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr "Супутникові знімки Mapbox"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr "Знімки DigitalGlobe Premium"
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr "Знімки DigitalGlobe Standard"
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -16549,6 +16563,9 @@ msgstr "OpenStreetMap (німецький стиль)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "GPS-треки OpenStreetMap"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr "Публічні GPS-треки, завантажені в OpenStreetMap."
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Громадський транспорт (ÖPNV)"
 
@@ -16579,6 +16596,9 @@ msgstr "Strava теплова мапа для бігунів та велосип
 msgid "Locator Overlay"
 msgstr "Шар Locator"
 
+msgid "Shows major features to help orient you."
+msgstr "Показує основні обʼєкти, що допомагають зорієнтуватись."
+
 msgid "QA No Address"
 msgstr "QA Без адрес"
 
@@ -16627,24 +16647,37 @@ msgstr "OSM Inspector: береговая лінія (ЄС)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr "imagico.de - знімки OSM для мапінгу: гірський масив Проклетіе"
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+"Знімки кінця літа, там де звичайні джерела сильно обмежені хмарами і снігом "
+"(true color)"
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr "imagico.de - знімки OSM для мапінгу: Південні Трансантарктичні гори"
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+"За межами звичайного покриття Landsat, тому відсутні в LIMA та Bing/Mapbox "
+"(true color)"
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr "imagico.de - знімки OSM для мапінгу: гори Пенсакола"
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr "imagico.de - знімки OSM для мапінгу: Острів слонів/Острів Кларенс"
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr "Досить чітке актуальне зображення границь льодовика (true color)"
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr "imagico.de - знімки OSM для мапінгу: Земля Ендбері та Берег Кемпа"
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
-msgstr ""
-"Знміки Sentinel-2 канали 234 (true color), Знімки Sentinel-2 Земля Ендбері "
-"та Берег Кемпа початок 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
+msgstr "Sentinel-2 - знімки Землі Ендербі та Берега Кемпа (true color)"
 
 msgid "IGN Argentina (TMS)"
 msgstr "IGN Аргентина (TMS)"
@@ -16685,15 +16718,34 @@ msgstr "LPI NSW Адміністративні границі національ
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr "imagico.de - знімки OSM для мапінгу: Північний Захід острова Херд"
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+"Льодовики на північному заході острова Херд (нещодавно замаплені) (ІЧ "
+"діапазон)"
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr "imagico.de - знімки OSM для мапінгу: узбережжя острова Херд"
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+"Останні зображення острова Херд, внутрішня частина в основному закрита "
+"хмарами, але добре видно узбережжя (true color)"
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr "Базова мапа Австрії, на основі урядових даних."
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at ортофото"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr "Шар ортофотознімків від basemap.at "
+
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
 
@@ -16709,6 +16761,12 @@ msgstr "Тирис: DGM (Модель поверхні)"
 msgid "Tiris: contour lines"
 msgstr "Tiris: лінії висот"
 
+msgid "Tiris: orthophoto"
+msgstr "Tiris: ортофото"
+
+msgid "Tiris: orthophoto infrared"
+msgstr "Tiris: ортофото ІЧ-діапазон"
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Відень: Багатоцільова мапа (загального призначення)"
 
@@ -16803,10 +16861,10 @@ msgid "SPW(allonie) 2009-2010 aerial imagery"
 msgstr "SPW(allonie) 2009-2010 аерофото"
 
 msgid "TEC bus lines"
-msgstr ""
+msgstr "Автобусний маршрут TEC"
 
 msgid "TEC bus stops"
-msgstr ""
+msgstr "Автобусна зупинка TEC"
 
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Бенін: Котону знімки з Плеяди 2016"
@@ -16814,9 +16872,18 @@ msgstr "Бенін: Котону знімки з Плеяди 2016"
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr "imagico.de - знімки OSM для мапінгу: Котону"
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+"Фрагментарне та частково закрите хмарами покриття зі звичайних джерел (true "
+"color)"
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Буве"
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+"Для більш точного додавання берегової лінії та льодовиків (true color)"
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Мапа міських районів"
 
@@ -16826,6 +16893,9 @@ msgstr "IBGE Мапа сільських районів"
 msgid "IBGE Distrito Federal"
 msgstr "IBGE Федеральний округ"
 
+msgid "Addresses data from IBGE"
+msgstr "Адресні дані від IBGE"
+
 msgid "Rio Mosaic 2013"
 msgstr "Ріо - мозаїка 2013"
 
@@ -16910,9 +16980,36 @@ msgstr "Літораль штата Алагоас, 2006"
 msgid "DER-ES"
 msgstr "DER-ES (Департамент автомобільних доріг штату Еспіріту-Санту)"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr "IBGE-BC250-ізольовані міські агломерації"
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr "IBGE-BC250-злітно-посакова смуга"
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr "IBGE-BC250-річкова мережа"
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr "IBGE-BC250-Дорожня мережа"
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr "IBGE-BC250-територія корінних народів"
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr "IBGE-BC250-громадські території (Військові)"
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr "IBGE-BC250-одиниці сталого розвитки - APA"
+
+msgid "IBGE-BC250-Villa"
+msgstr "IBGE-BC250-маєтки"
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr "IBGE-BCIM-Генеруючі станції (Електрика)"
+
+msgid "IBGE-BCIM-Município"
+msgstr "IBGE-BCIM-Муніципалітети"
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Гідрографія"
 
@@ -16928,31 +17025,66 @@ msgstr "Британська Колумбія Мозаїка"
 msgid "Latest southwest British Columbia Landsat"
 msgstr "Landsat – останні знімки північний захід Британської Колумбії"
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+"Останні знімки Landsat Британської Колумбії низької розподільчої здатності"
+
 msgid "Kelowna 2012"
 msgstr "Келоуна 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr "Високоякісні аерофотознімки міста Келоуна"
+
 msgid "Kelowna Roads overlay"
 msgstr "Келоуна дороги, шар"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr "imagico.de - знімки OSM для мапінгу: Східне узбережжя острова Девон"
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr "Берегова лінія знята останім часом (ІЧ діапазон)"
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Північний Елсмір"
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Збірка зі знімків ASTER червня 2012 (true color з відновленим блакитним)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr "imagico.de - знімки OSM для мапінгу: Північний Елсмір липень 2016"
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+"Збірка зі знімків ASTER червня 2016 (true color з відновленим блакитним)"
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr "imagico.de - знімки OSM для мапінгу: Фогу, Кабо-Верде"
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr "Знімки після виверження 2014/2015  років (true color)"
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Лондондеррі"
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+"Багато узбереж, які були накреслені приблизно, можуть бути покращені тут, "
+"через велику кількість снігу не годиться для ля обкреслювання льодовиків (ІЧ "
+"діапазон)"
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr "imagico.de - знімки OSM для мапінгу: вулкан Кальбуко"
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr "Знімки після виверження 2015  року (true color)"
+
 msgid "Czech CUZK:KM"
 msgstr "Чехія CUZK:KM"
 
@@ -16971,14 +17103,14 @@ msgstr "Прага IPR свіжі ортофото"
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr "Прага IPR ортофото без рослинності"
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Агенція геоданих (Данія)"
+msgid "SDFE aerial imagery"
+msgstr "SDFE аерофото"
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr "Geodatastyrelsen кадастрові ділянки INSPIRE"
+msgid "SDFE Cadastral Parcels INSPIRE View"
+msgstr "SDFE Кадастровий поділ - вид INSPIRE"
 
-msgid "Geodatastyrelsen DTK Kort25"
-msgstr "Геодані агентство DTK Kort25"
+msgid "SDFE DTK Kort25"
+msgstr "SDFE DTK Kort25"
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
 msgstr "SDFE мапа рельєфу (40 см)"
@@ -16986,22 +17118,36 @@ msgstr "SDFE мапа рельєфу (40 см)"
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr "SDFE мапа поверхні (40 см)"
 
-msgid "Geodatastyrelsen Skærmkort"
-msgstr "Геодані агентство Skærmkort"
+msgid "SDFE Skærmkort"
+msgstr "SDFE Skærmkort"
 
-msgid "Stevns (Denmark)"
-msgstr "Стевнс (Данія)"
+msgid "Stevns"
+msgstr "Стевнс"
 
-msgid "Vejmidte (Denmark)"
-msgstr "Веджима́йт (Данія)"
+msgid "Vejmidte"
+msgstr "Централі частини міст"
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr "imagico.de - знімки OSM для мапінгу: вулкан Алтар"
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+"Знімки ASTER 2007 забезпечують краще охоплення льодовиків, ніж звичайні "
+"джерела (true color з відновленим блакитним)"
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "imagico.de - знімки OSM для мапінгу: острови Дарвіна и Вулфа, Галапагоси"
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+"Недавні знімки, в інших джерелах зараз лише старі і погані знімки (true "
+"color)"
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Естонія Базова мапа (Maaamet)"
 
@@ -17020,6 +17166,9 @@ msgstr "Естонія ліси (Maaamet)"
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr "Французький адресний реєстр та Національна база адрес"
+
 msgid "BD Carthage"
 msgstr "BD Carthage"
 
@@ -17032,6 +17181,9 @@ msgstr "Бордо - 2012"
 msgid "Cadastre"
 msgstr "Кадастр"
 
+msgid "French land registry"
+msgstr "Земельний реєстр Франції"
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Овернь 2013 - 25 см"
 
@@ -17160,21 +17312,28 @@ msgstr ""
 "imagico.de - знімки OSM для мапінгу: прибережні мілини Північної Німеччини"
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+"Актуальні знімки узбережжя, зроблені під час відливу, для мапінгу приливних "
+"територій (true color)"
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 "imagico.de - знімки OSM для мапінгу: прибережні мілини Північної Німеччини "
 "(інфрачервоні знімки)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Північного моря, 2016"
-
 msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
-"Канали 234 (true color), актуальні знімки з відливами на узбережжі для "
-"оновлення приливних мілин та мілководдя"
+"Актуальні знімки узбережжя, зроблені під час відливу, для мапінгу приливних "
+"територій (ІЧ діапазон)"
+
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Північного моря, 2016"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Саксонія - свіжі знімки"
@@ -17206,9 +17365,15 @@ msgstr "Мюнхен: нові аерофотознімки 60 см"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr "imagico.de - знімки OSM для мапінгу: Касігіаннгуіт"
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr "Icebridge DMS - знімки поселення (вирівнювання може бути неточним)"
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr "imagico.de - знімки OSM для мапінгу: авіабаза Туле"
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr "Знімки Icebridge DMS (вирівнювання може бути неточним)"
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
@@ -17217,6 +17382,11 @@ msgstr ""
 "висотах вересень 2015"
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+"Icebridge DMS - аерознімки з авіабази Тулє (вирівнювання може бути неточним)"
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -17230,15 +17400,36 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr "imagico.de - знімки OSM для мапінгу: Гренландія мозаїка"
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr "Landsat - мозаїка Гренландії (true color)"
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr "imagico.de - знімки OSM для мапінгу: травень 2013 Landsat від надіра"
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+"Перші з доступних знімків північних територій, що знаходяться за межами "
+"звичайних знімків Landsat. Через велику кількість снігу з ними важко "
+"працювати"
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr "imagico.de - знімки OSM для мапінгу: липень 2016 Landsat від надіра"
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr "Останні знімки Landsat північніше звичайної межі (true color)"
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr "imagico.de - знімки OSM для мапінгу: Північна Гренландія ASTER"
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+"Збірка, в переважно зі знімків ASTER 2012, деякі знімки 2005 року, в "
+"основному на північний схід (true color з відновленим блакитним0"
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Знімки дронів (Гаїті)"
 
@@ -17299,18 +17490,39 @@ msgstr "Угорщина рель’єф"
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr "imagico.de - знімки OSM для мапінгу: Східна Ісландія"
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr "Відсутні острівці та неточна лінія узбережжя"
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr "imagico.de - знімки OSM для мапінгу: Качский Ранн"
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr "Межа землі/води, яку важко розгледіти на знімках Bing/Mapbox"
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr "imagico.de - знімки OSM для мапінгу: Південно-Східний Сулавесі"
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+"Відсутні острівці та неточна лінія узбережжя, через хмарність на Bing, також "
+"для додавання додаткових елементів озерам (true color)"
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr "imagico.de - знімки OSM для мапінгу: водосховище Бакун"
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr "Відсутнє на старих знімках до 2011 р (true color)"
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr "imagico.de - знімки OSM для мапінгу: Батам"
 
+msgid "Missing Islands in OSM (true color)"
+msgstr "Відсутні в OSM острови (true color)"
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ірландія Міністерство оборони Великобританії 1:25000 GSGS 3906"
 
@@ -17375,18 +17587,29 @@ msgstr "Південний Тіроль ортофото 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr "Південний Тіроль ортофото 2011 (highres)"
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr "Ортофото Південний Тіроль 2011, 20 см (великі долини)"
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr "Південний Тіроль ортофото 2014"
 
 msgid "South Tyrol Topomap"
 msgstr "Південний Тіроль топомапа"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr "Топографічна базова мапа Південного Тіролю"
+
 msgid "Japan GSI ortho Imagery"
 msgstr "Японія: ортознімки GSI"
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr "imagico.de - знімки OSM для мапінгу: гора Кенія, 2016"
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr "Актуальні знімки для мапінгу льодовиків (true color)"
+
 msgid "USSR - Latvia"
 msgstr "СРСР - Латвія"
 
@@ -17420,28 +17643,36 @@ msgstr "Люксембург Inspire Води"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Дельта Нігера, жовт. 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr "Аерофото PDOK 25 см (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
+msgstr "Аерофотознімки PDOK 25 см"
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr "Аерофото PDOK 25 см (WMTS)"
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr "LINZ NZ - аерофотознімки"
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr "LINZ NZ Topo50 - мапа без сітки"
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr "Шпіцберген - ортофото 2009/2011 EPSG:25833"
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr "imagico.de - знімки OSM для мапінгу: мозаїка Шпіцбергену"
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
-msgstr ""
-"Sentinel-2 мозаїка Шпіцбергену, переважно Sentinel-2 2016 канали 234 (true "
-"color),"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
+msgstr "Sentinel-2 - мозаїка Шпіцбергену (true color)"
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr "imagico.de - знімки OSM для мапінгу: Західний Каракорум"
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+"Мінімальний сніговий шар, добре підходить для мапінгу льодовиків (true color)"
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Сектор Газа - Pléiades - 06.07.2014"
 
@@ -17452,15 +17683,32 @@ msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 "imagico.de - знімки OSM для мапінгу: Панамський канал – Тихоокеанська частина"
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+"Нові шлюзи з меншою кількістю хмар, ніж на знімках Sentinel-2 - перевірте "
+"привʼязку знімків (true color)"
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr "imagico.de - знімки OSM для мапінгу: Панамський канал"
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr "Знімки нових шлюзів (частково захмарені)"
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr "imagico.de - знімки OSM для мапінгу: Ванатінаі"
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+"Приблизна лінія узбережжя через захмареність Bing/Mapbox (true color)"
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr "imagico.de - знімки OSM для мапінгу: Нова Ірландія"
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr "Багато відсутніх в OSM островів (знятті останнім часом) (true color)"
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr "imagico.de - знімки OSM для мапінгу: Коропуна"
 
@@ -17470,8 +17718,11 @@ msgstr ""
 "imagico.de - знімки OSM для мапінгу: гори Вільканота та Крижана шапка "
 "Куелччая"
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr "Низькоякісні чи застаріли знімки в інших джерелах (true color)"
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
-msgstr ""
+msgstr "Пангасінан/Булакан (Філіппіни HiRes)"
 
 msgid "Geoportal 2: Ortofotomapa (aerial image)"
 msgstr "Geoportal 2: ортофото"
@@ -17608,27 +17859,39 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr "imagico.de - знімки OSM для мапінгу: Керченська протока"
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr "Стан будівництва мосту в серпні 2016 (true color)"
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Печорського моря"
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr "Знімки Sentinel-2 берега Печорського моря восени 2016 (true color)"
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr "imagico.de - знімки OSM для мапінгу: Острів Ушакова серпень 2016"
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr "Актуальні знімки кінця літа з невеличкою хмарністю (true color)"
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 "imagico.de - знімки OSM для мапінгу: Північний і Полярний Урал серпень 2016"
 
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
+msgstr ""
+"Актуальні знімки кінця літа з невеличкою хмарністю (true color) - увага: не "
+"весь сніг є льодовиками (true color)"
+
 msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr "imagico.de - знімки OSM для мапінгу: космодром Східний (Восточний)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Печорського моря"
-
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
-msgstr ""
-"канали 234 (true color), знімки Sentinel-2 узбережжя Печорського моря осінь "
-"2016"
+msgid "Recent image showing newest features (true color)"
+msgstr "Останні знімки із самими останніми змінами"
 
 msgid "Freemap.sk Car"
 msgstr "Freemap.sk Автомобільна"
@@ -17654,18 +17917,39 @@ msgstr "RABA-KGZ: Словенія - територія забудови"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "Місто Кейптаун 2013 аерофото"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+"Тільки для використання в OpenStreetMap. Аерофотознімки муніципальної "
+"області Кейп-Тауна. Розмір пікселя на місцевості (GSD) - 12 см"
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "Кейптаун, аерофото 2015"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+"Тільки для використання в OpenStreetMap. Аерофотознімки муніципальної "
+"області Кейп-Тауна. Розмір пікселя на місцевості (GSD) - 8 см"
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Південна Африка CD:NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова ASTER"
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+"Відсутні в інших джерелах знімків дані (true color з відновленим блакитним)"
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Скотта"
 
+msgid "Missing in other image sources (true color)"
+msgstr "Відсутні в інших джерелах знімків дані (true color)"
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова Landsat"
 
@@ -17699,6 +17983,9 @@ msgstr "GRAFCAN Express - Канарські острови"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr "imagico.de - знімки OSM для мапінгу: Адамів міст"
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr "Доповнюють неповне покриття з інших джерел (true color)"
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Кантон Аргау 25 см (AGIS 2011)"
 
@@ -17778,12 +18065,24 @@ msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 "imagico.de - знімки OSM для мапінгу: Центральні Альпи, кінець вересня 2016"
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+"Актуальні знімки для мапінгу льодовиків (true color). Візьміть до уваги "
+"наявність свіжого снігу на великих висотах."
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Тайвань e-Map Open Data"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "Тайвань e-Map Open Data (з лініями висот)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+"Електронна мапа з Національного центру землеустрою та картографії Тайваню "
+"(NLSC)"
+
 msgid "Taiwan Village Boundaries"
 msgstr "Тайвань межі поселень"
 
@@ -17819,6 +18118,9 @@ msgid ""
 "zooms, only changes since 2006 minus changes already incorporated into "
 "OpenStreetMap"
 msgstr ""
+"Для масштабу більше за 16 – публічні дані Бюро перепису населення США. Для "
+"більш низьких масштабів – тільки зміни починаючи з 2006 року, крім вже "
+"наявних в OpenStreetMap"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Ділянки"
@@ -17831,6 +18133,8 @@ msgid ""
 "has a pixel resolution of 6 inches and is comprised of imagery flown in "
 "2010, 2012, 2013, and 2014"
 msgstr ""
+"Найсвіжіші повнокольорові знімки Північної Кароліни. Розподільча здатність 6 "
+"дюймів/піксель для знімків 2010, 2012, 2013 та 2014"
 
 msgid "U.S. Forest Service roads"
 msgstr "Дороги лісової служби США"
@@ -17839,9 +18143,11 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr "imagico.de - знімки OSM для мапінгу: діапазон Аляски"
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
+"Недавні літні знімки Аляскінського хребта для картографування природних "
+"об’єктів (true color)"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "NJ 2015 аерофото (інфрачервоний діапазон)"
@@ -17849,6 +18155,8 @@ msgstr "NJ 2015 аерофото (інфрачервоний діапазон)"
 msgid ""
 "Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
 msgstr ""
+"Цифрові ортофотознімки Нью-Джерсі, ближній інфрачервоний діапазон, "
+"розподільча здатність 1 фут"
 
 msgid "NJ 2015 Aerial Imagery (Natural Color)"
 msgstr "NJ 2015 аерофото (природні кольори)"
@@ -17856,6 +18164,8 @@ msgstr "NJ 2015 аерофото (природні кольори)"
 msgid ""
 "Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
 msgstr ""
+"Цифрові ортофотознімки Нью-Джерсі, природні кольори, розподільча здатність 1 "
+"фут"
 
 msgid "San Juan Metro Area: 2013 USACE Orthophotos"
 msgstr "Міська агломерація Сан-Хуан: ортофото USACE 2013"
@@ -17867,6 +18177,8 @@ msgid ""
 "Public domain aerial imagery taken in May/June 2013 from San Juan County, "
 "WA. Resolution is 9 inch."
 msgstr ""
+"Публічні аерофотознімки Травень/Червень графство Сан - Хуан, штат Вашингтон. "
+"9 дюймів"
 
 msgid "WA 2016 aerial imagery for San Juan County"
 msgstr "Округ Сан-Хуан (Вашингтон) - аерофото 2016"
@@ -17885,6 +18197,8 @@ msgid ""
 "Public domain street and address data from the San Juan County, WA. Updated "
 "at least quarterly."
 msgstr ""
+"Публічні дані про адреси та вулиці від графства Сан-Хуан. штат Вашингтон. "
+"Оновлюються раз на квартал."
 
 msgid "Texas Orthophoto"
 msgstr "Техас ортофото"
@@ -17896,7 +18210,7 @@ msgid "MD Latest 6 Inch Aerial Imagery"
 msgstr "MD Свіжі 6 дюймі аерофото"
 
 msgid "Six Inch resolution aerial imagery for the State of Maryland"
-msgstr ""
+msgstr "Знімки штат Меріленд, 6 дюймів"
 
 msgid "MD Three Inch Aerial Imagery"
 msgstr "Меріленд: знімки 3 дюйми"
@@ -17904,7 +18218,7 @@ msgstr "Меріленд: знімки 3 дюйми"
 msgid ""
 "Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
 "Annapolis"
-msgstr ""
+msgstr "Знімки міст Роквілл, Гейтерсберг і Аннаполіс, 3 дюйми"
 
 msgid "MD Transportation Basemap"
 msgstr "Меріленд: базова мапа транспорту"
@@ -17912,14 +18226,29 @@ msgstr "Меріленд: базова мапа транспорту"
 msgid ""
 "Maryland State Highway Administration road features and additional Maryland "
 "focused landmarks"
-msgstr ""
+msgstr "Дороги та памʼятні знаки від Адміністрації доріг штату Меріленд"
 
 msgid "Delaware 2012 Orthophotography"
 msgstr "Делавер - ортофото 2012"
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+"Цей набір даних складається з ортознімків з роздільною здатністю 0.3 м в "
+"природних кольорах та ближньому ІЧ-діапазоні (4 діапазони - R, G, B, IR), що "
+"охоплюють округи Нью-Касл, Кент і Сассекс штату Делавер."
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори"
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+"Недавні знімки більшості наявних льодовиків гір Рувензори (ІЧ-діапазон)"
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори 2016"
 
@@ -17971,240 +18300,730 @@ msgstr "NLS - вид. Bartholomew, напівдюймова, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "Плани міст від OS, Абердін 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м Абердін (1866-1867), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "Плани міст від OS, Еірдрі 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Ейрдрі (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "Плани міст від OS, Олександрія  1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Олександрія (1859), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "Плани міст від OS, Оулла 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Аллоа (1861-1862), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "Плани міст від OS, Ананн 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Аннан (1859), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "Плани міст від OS, Аброас 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Арброт (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "Плани міст від OS, Ер 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Ейр (1855), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "Плани міст від OS, Бервік-на-Твід 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Докладний план м.Бервік-апон-Твід (1852), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "Плани міст від OS, Бріхін 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Бріхін (1862), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "Плани міст від OS, Бурнтісланд 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Бернтайленд (1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "Плани міст від OS, Кемпбелтон 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Кемпбелтон (1865), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "Плани міст від OS, Коатбрідж 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Котбрідж (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS: плани міст, Купар 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Капар (1854), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "Плани міст від OS, Купар 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Капар (1893-1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "Плани міст від OS, Далкейт  1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Далкіт (1852), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "Плани міст від OS, Далкейт 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Далкіт (1893), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "Плани міст від OS, Дамбартон 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Дамбартон (1859), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "Плани міст від OS, Дамфріз 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Дамфріс (1850), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "Плани міст від OS, Дамфріз 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Дамфріс (1893), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "Плани міст від OS, Данді 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Данді (1857-1858), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "Плани міст від OS, Данді 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Данді (1870-1872), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "Плани міст від OS, Данфермлін 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Данфермлін (1854), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "Плани міст від OS, Данфермлін 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Данфермлін (1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "Плани міст від OS, Едінбург 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Едінбург (1849-1851), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "Плани міст від OS, Едінбург 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Едінбург (1876-1877), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "Плани міст від OS, Едінбург 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Едінбург (1893-1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "OS Плани міст, Единбург 1940-1960 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Едінбург (1940-і - 1960-і), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "Плани міст від OS, Елгін 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Елгін (1868), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "Плани міст від OS, Фалкірк 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Фолкерк (1858-1859), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "Плани міст від OS, Форфар 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Форфар (1860-1861), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "Плани міст від OS, Форрес Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Форрес (1868), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "Плани міст від OS, Галашилс 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Галашилс (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "Плани міст від OS, Гірван 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Герван (1857), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "Плани міст від OS, Глазго 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Глазго (1857-1858), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "Плани міст від OS, Глазго 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Глазго (1892-1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "Плани міст від OS, Грінок 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Грінок (1857), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "Плани міст від OS,  Хаддінгтон 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Хаддінгтон (1853), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "Плани міст від OS, Хаддінгтон 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Хаддінгтон (1893), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "Плани міст від OS, Гамільтон 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Гамільтон (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "Плани міст від OS, Хоїк 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Хоїк (1857-1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "Плани міст від OS, Інвернесс 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Інвернесс (1867-1868), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "Плани міст від OS, Ірвін 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Ервін (1859), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "Плани міст від OS, Джедбург 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Джедборо (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "Плани міст від OS, Келсо 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Келсо (1857), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "Плани міст від OS, Кілмарнок 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Кілмарнок (1857-1859), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "Плани міст від OS, Киркалді 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Керколді (1855), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "Плани міст від OS, Киркалді 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Керколді (1894), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "Плани міст від OS, Кіркудбрайт 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Керкубрі (1850), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "Плани міст від OS, Кіркудбрайт 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Керкубрі (1893), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "Плани міст від OS, Кьоркентілек 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Керкінтіллох (1859), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "Плани міст від OS, Кір’ємуір 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Кіррімьюір (1861), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "Плани міст від OS, Ланарк 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Ланарк (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "Плани міст від OS, Лінлітго 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Лінлітгоу (1856), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "Плани міст від OS, Майол 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Мейбол (1856-1857), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "Плани міст від OS, Монтроуз 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Монтроз (1861-1862), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "Плани міст від OS, Массельбург 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Масселбург (1853), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "Плани міст від OS,  Массельбург 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Масселбург (1893), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "Плани міст від OS, Наїрн 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Нерн (1867-1868), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "Плани міст від OS, Обан 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Обан (1867-1868), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans, Пейслі 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Пейслі (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "Плани міст від OS, Піблз 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Піблс (1856), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "Плани міст від OS, Перт 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Перт (1860), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "Плани міст від OS, Петерхед 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Пітерхед (1868), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "Плани міст від OS, Порт Глазго 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+"Докладний план м.Порт-Глазго (1856-1857), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "Плани міст від OS, Портобелло 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Портобелло (1893-1894), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "Плани міст від OS, Ротсей 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Ротсей (1862-1863), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "Плани міст від OS, Селкирк 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Селкерк (1865), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "Плани міст від OS, Сент-Ендрюс 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Сент-Андрус (1854), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "Плани міст від OS, Сент-Ендрюс 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Сент-Андрус (1893), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "Плани міст від OS, Стірлінг 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Стерлінг (1858), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "Плани міст від OS, Стонхейвен 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Стонхейвен (1864), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "Плани міст від OS, Странріїр 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Странрар (1847), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "Плани міст від OS, Странріїр 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Странрар (1863-1877), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "Плани міст від OS, Странріїр 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Странрар (1893), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "Плани міст від OS, Стартхевен 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+"Докладний план м.Стратхейвен (1858), надано Національною бібліотекою "
+"Шотландії."
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "Плани міст від OS, Виік 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Уїк (1872), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "Плани міст від OS, Вінгтон 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Уігтаун (1848), надано Національною бібліотекою Шотландії."
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "Плани міст від OS, Вінгтон 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+"Докладний план м.Уігтаун (1894), надано Національною бібліотекою Шотландії."
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr "Останні знімки Landsat"
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -21657,7 +22476,7 @@ msgid "Wash"
 msgstr "Мийка"
 
 msgid "Self Service"
-msgstr ""
+msgstr "Самообслуговування"
 
 msgid "Car Dealer"
 msgstr "Автомобільний дилер"
@@ -24973,6 +25792,9 @@ msgstr "Морепродукти"
 msgid "Dairy"
 msgstr "Молочні продукти"
 
+msgid "Cheese"
+msgstr "Сир"
+
 msgid "Deli (Fine Food)"
 msgstr "Делікатеси (Вишукана їжа)"
 
@@ -26458,19 +27280,19 @@ msgid "Label point"
 msgstr "Мітка з назвою"
 
 msgid "Outline of building"
-msgstr ""
+msgstr "Контур будівлі"
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Внутрішній сегмент"
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Коник даху"
 
 msgid "Roof edge"
-msgstr ""
+msgstr "Край даху"
 
 msgid "Building level"
-msgstr ""
+msgstr "Поверх будівлі"
 
 msgid "Site"
 msgstr "Місцевість"
@@ -27288,6 +28110,9 @@ msgstr "{0} має бути цілим позитивним числом"
 msgid "unusual value of {0}"
 msgstr "незвичайне значення {0}"
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr "{0} повинне бути числом в метрах, без зазначення одиниць виміру"
+
 msgid "relation without type"
 msgstr "зв’язок без типу"
 
@@ -28309,41 +29134,44 @@ msgid "Go forward"
 msgstr "Вперед"
 
 msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Які шари зображень ви бажаєте імпортувати до шару Mapillary?"
 
 msgid "Import"
 msgstr "Імпортувати"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr "Неможливо імпортувати геотеговані знімки до шару Mapillary’!"
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
-msgstr ""
+msgstr "З яких джерел ви бажаєте імпортувати зображення до шару Mapillary?"
 
 msgid "There are currently no layers with geotagged images!"
-msgstr ""
+msgstr "Шар зображень з геопривʼязкою відсутній!"
 
 msgid "Images from my file system"
-msgstr ""
+msgstr "Зображення з моєї файлової системи"
 
 msgid "Select the images you want to import"
-msgstr ""
+msgstr "Оберіть зображення для імпорту"
 
 msgid "All images in a directory"
-msgstr ""
+msgstr "Всі зображення у теці"
 
 msgid "Select directory to import images from"
-msgstr ""
+msgstr "Оберіть теку для імпорту зображень з неї"
 
 msgid "From existing image layer"
-msgstr ""
+msgstr "З поточного шару зображень"
 
 msgid "Import exception"
-msgstr ""
+msgstr "Обмеження імпорту"
 
 msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Неможливо імпортувати зображення ''{0}''!"
 
 msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "Неможливо імпортувати теку ''{0}''!"
 
 msgid ""
 "A tag with key <i>{0}</i> is already present on the selected OSM object."
@@ -29305,6 +30133,37 @@ msgid "Debugging mode will write images for each processing step."
 msgstr ""
 "В режимі відлагодження будут створені зображення для кожного кроку оробки."
 
+msgid "Please choose the address type"
+msgstr "Оберить тип адреси"
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+"<html>Ми не можемо автоматично визначити чи є <strong>{0}</strong> (частини "
+"адреси {0} {1}, {2} {3}) <strong>вулицею</strong> або назвою "
+"<strong>місцевості</strong>. Якщо <strong>{0}</strong> – є вулицею, оберіть, "
+"будь ласка, \"вулиця\" нижче. Якщо  <strong>{0}</strong> – є назвою села, "
+"хутора, місцевості або іншого обʼєкта, відмінного від вулиці, оберіть "
+"\"місце\".</html>"
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr "<html>{0} є <strong>вулицею</strong>.</html>"
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr "<html>{0} є <strong>місцем</strong>.</html>"
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+"<html>Запамʼятати мій вибір для <strong>{0}</strong> в {1} {2} для цієї "
+"сесії.</html>"
+
 msgid "Fetch Address"
 msgstr "Отримати адресу"
 
@@ -29314,6 +30173,9 @@ msgstr "Austria Address Helper<br>Будь ласка, оберіть тільк
 msgid "Austria Address Helper"
 msgstr "Austria Address Helper"
 
+msgid "No address type selected. Aborting."
+msgstr "Тип адреси не обрано. Роботу припинено."
+
 msgid "Successfully added address to selected object:"
 msgstr "Адресу було додано до виділеного обʼєкта:"
 
@@ -34146,24 +35008,6 @@ msgstr "Знак {0}"
 msgid "Additional sign {0}"
 msgstr "табличка {0}"
 
-msgid "Edit relation"
-msgstr "Редагувати зв’язок"
-
-msgid "Edit relations"
-msgstr "Редагувати зв’язки"
-
-msgid "No relation is selected"
-msgstr "Не виділено жодного зв’язку"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Вилучити точку ''{0}'' в позиції {1} зі зв’язку ''{2}''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Вилучити лінію ''{0}'' в позиції {1} зі зв’язку ''{2}''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Вилучити зв’язок ''{0}'' в позиції {1} зі зв’язку ''{2}''"
-
 msgid "routing active route"
 msgstr "відстеження активного маршруту"
 
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 200713c..f594a91 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2010-05-13 04:15+0000\n"
 "Last-Translator: Shoaib Mirza <Unknown>\n"
 "Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:12+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:14+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: ur\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5391,6 +5391,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5473,33 +5490,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5547,12 +5553,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10116,9 +10116,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11815,7 +11812,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13084,7 +13081,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14201,9 +14203,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14213,9 +14212,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14226,9 +14222,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14811,6 +14815,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14838,6 +14848,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14868,6 +14881,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14916,21 +14932,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14972,15 +14999,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14996,6 +15038,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15101,9 +15149,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15113,6 +15167,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15197,9 +15254,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15215,31 +15299,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15258,13 +15371,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15273,21 +15386,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15306,6 +15429,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15318,6 +15444,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15445,16 +15574,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15487,15 +15621,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15507,15 +15651,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15576,18 +15736,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15651,18 +15830,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15696,26 +15886,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15725,15 +15924,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15741,6 +15954,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15879,23 +16095,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15922,18 +16150,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15967,6 +16211,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16045,12 +16292,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16106,8 +16361,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16131,345 +16386,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23055,6 +23696,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25300,6 +25944,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26272,6 +26919,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27124,6 +27774,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27133,6 +27806,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31670,24 +32346,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index e3bc025..24a2c6d 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2015-05-14 20:17+0000\n"
 "Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
 "Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:13+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:14+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: vi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5704,6 +5704,26 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "phiên bản của họ ({0} entry)"
 
+msgid "My version (local dataset)"
+msgstr "phiên bản của tôi (tập dữ liệu địa phương)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+"Properties trong bộ dữ liệu của tôi, tức là các tập dữ liệu địa phương"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Properties trong các yếu tố hợp nhất. Họ sẽ thay thế các thuộc tính trong "
+"tôiYếu tố khi quyết định hợp nhất được áp dụng."
+
+msgid "Their version (server dataset)"
+msgstr "phiên bản (máy chủ dữ liệu) của họ"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Properties trong bộ dữ liệu của họ, tức là các tập dữ liệu máy chủ"
+
 msgid "My with Their"
 msgstr "của tôi với họ"
 
@@ -5788,29 +5808,6 @@ msgstr "Node"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "nút Merged không đông lạnh chưa. Không thể xây dựng lệnh giải quyết."
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-"Properties trong bộ dữ liệu của tôi, tức là các tập dữ liệu địa phương"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Properties trong các yếu tố hợp nhất. Họ sẽ thay thế các thuộc tính trong "
-"tôiYếu tố khi quyết định hợp nhất được áp dụng."
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Properties trong bộ dữ liệu của họ, tức là các tập dữ liệu máy chủ"
-
-msgid "Coordinates:"
-msgstr "Tọa độ:"
-
-msgid "Deleted State:"
-msgstr "Deleted Nhà nước:"
-
-msgid "Referenced by:"
-msgstr "Tham chiếu bởi:"
-
 msgid "(none)"
 msgstr "(không có)"
 
@@ -5820,6 +5817,15 @@ msgstr "xóa"
 msgid "not deleted"
 msgstr "không xóa"
 
+msgid "Deleted State:"
+msgstr "Deleted Nhà nước:"
+
+msgid "Coordinates:"
+msgstr "Tọa độ:"
+
+msgid "Referenced by:"
+msgstr "Tham chiếu bởi:"
+
 msgid "Keep my coordinates"
 msgstr "Giữ tọa độ của tôi"
 
@@ -5865,12 +5871,6 @@ msgstr "Key"
 msgid "Value"
 msgstr "Giá trị"
 
-msgid "My version (local dataset)"
-msgstr "phiên bản của tôi (tập dữ liệu địa phương)"
-
-msgid "Their version (server dataset)"
-msgstr "phiên bản (máy chủ dữ liệu) của họ"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Giữ cặp khóa được lựa chọn / giá trị từ các số liệu địa phương"
 
@@ -10800,9 +10800,6 @@ msgstr "Đóng hộp thoại và hủy ủy quyền"
 msgid "Close the dialog and accept the Access Token"
 msgstr "Đóng hộp thoại và chấp nhận truy cập token"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "Không thể hủy bỏ chạy hoạt động OAuth"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Lấy OAuth Request token từ '' {0} ''"
 
@@ -12625,8 +12622,8 @@ msgstr "PUWG Zone"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Thụy Sĩ)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i> CH1903 / LV03 (không có sửa chữa địa phương) </ i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -14016,11 +14013,13 @@ msgstr "Reading đã bị hủy bỏ"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"Thiếu thuộc tính bắt buộc về yếu tố '' giới hạn ''. ChấnMinlon = '' {0} '', "
-"minlat = '' {1} '', maxlon = '' {3} '', maxlat = '' {4} '', nguồn gốc = '' "
-"{5} '' ."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "cách xóa {0} chứa các nút"
@@ -15294,9 +15293,6 @@ msgstr "Mở URL: {0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL không chứa {0} / {1} / {2}"
 
-msgid "reserved"
-msgstr "dành riêng"
-
 msgid "Outdated Java version"
 msgstr "phiên bản Java lỗi thời"
 
@@ -15306,9 +15302,6 @@ msgstr "Update Java"
 msgid "You are running version {0} of Java."
 msgstr "Bạn đang chạy phiên bản {0} của Java."
 
-msgid "April 2015"
-msgstr "April 2015"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -15323,9 +15316,17 @@ msgstr ""
 "JOSM sẽ sớm ngừng làm việc với phiên bản này, chúng tôi khuyên bạn nên "
 "bạnCập nhật cho Java {0}."
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "Bạn có muốn cập nhật bây giờ?"
 
+msgid "reserved"
+msgstr "dành riêng"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -15942,6 +15943,12 @@ msgstr "HDM (Humanitarian OpenStreetMap Team)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox vệ tinh"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -15969,6 +15976,9 @@ msgstr "OpenStreetMap (German Style)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS vết"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "Giao thông vận tải công cộng (ÖPNV)"
 
@@ -15999,6 +16009,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "QA Không Address"
 
@@ -16047,21 +16060,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -16103,15 +16127,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -16127,6 +16166,12 @@ msgstr "Tiris: DOM (mô hình bề mặt)"
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (mục đích chung)"
 
@@ -16232,9 +16277,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr "IBGE Mapa de Setores Urbanos"
 
@@ -16244,6 +16295,9 @@ msgstr "IBGE Mapa de Setores Rurais"
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -16328,9 +16382,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr "Geobase Thủy"
 
@@ -16346,31 +16427,60 @@ msgstr "British Columbia Mosaic"
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr "Kelowna 2012"
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Đường overlay"
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK: KM"
 
@@ -16389,13 +16499,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
-msgstr "Geodatastyrelsen (Đan Mạch)"
+msgid "SDFE aerial imagery"
+msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -16404,21 +16514,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Đan Mạch)"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Đan Mạch)"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia basemap (Maaamet)"
 
@@ -16437,6 +16557,9 @@ msgstr "Estonia Lâm nghiệp (Maaamet)"
 msgid "BANO"
 msgstr "Bano"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -16449,6 +16572,9 @@ msgstr "Bordeaux - 2012"
 msgid "Cadastre"
 msgstr "Địa chính"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013-25 cm"
 
@@ -16578,16 +16704,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -16620,15 +16751,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -16640,15 +16781,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr "Drone Hình ảnh (Haiti)"
 
@@ -16709,18 +16866,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Ireland British War Văn phòng 1: 25k GSGS 3906"
 
@@ -16784,18 +16960,29 @@ msgstr "South Tyrol Orthofoto 2011"
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr "South Tyrol Topomap"
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "Liên Xô - Latvia"
 
@@ -16829,26 +17016,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Niger Delta tháng 10 năm 2012 Landsat"
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr "Dải Gaza - Pléiades - 2014/07/06"
 
@@ -16858,15 +17054,29 @@ msgstr "Dải Gaza - Pléiades - 2014/07/06 (NIR)"
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -16874,6 +17084,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -17012,23 +17225,35 @@ msgstr "ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -17055,18 +17280,34 @@ msgstr "Raba-KGZ: Slovenia xây dựng lên các khu vực"
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "Nam Phi CD: NGI Aerial"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -17100,6 +17341,9 @@ msgstr "GRAFCAN Express - Quần đảo Canary"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Kanton Aargau 25cm (AGIS 2011)"
 
@@ -17178,12 +17422,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -17239,8 +17491,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -17315,9 +17567,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -17369,240 +17632,615 @@ msgstr "NLS - Bartholomew Nửa Inch, 1897-1907"
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Kế hoạch, Aberdeen 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Airdrie 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Kế hoạch, Alexandria 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Kế hoạch, Alloa 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Kế hoạch, Annan 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Arbroath 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "hệ điều hành kế hoạch Town, Ayr 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Kế hoạch, Berwick-upon-Tweed 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Kế hoạch, Brechin 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Kế hoạch, Burntisland 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Kế hoạch, Campbelton 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Coatbridge 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Kế hoạch, Cupar 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Kế hoạch, Cupar 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Kế hoạch, Dalkeith 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Dalkeith năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Kế hoạch, Dumbarton 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Kế hoạch, Dumfries 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Dumfries năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Kế hoạch, Dundee 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Kế hoạch, Dundee 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Kế hoạch, Dunfermline 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Kế hoạch, Dunfermline 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "hệ điều hành kế hoạch Town, Edinburgh 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "hệ điều hành kế hoạch Town, Edinburgh 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "hệ điều hành kế hoạch Town, Edinburgh 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Kế hoạch, Elgin 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Kế hoạch, Falkirk 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Kế hoạch, Forfar 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Kế hoạch, Forres 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Galashiels 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Kế hoạch, Girvan 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Kế hoạch, Glasgow 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Kế hoạch, Glasgow 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Kế hoạch, Greenock 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Kế hoạch, Haddington 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Haddington năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Hamilton 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Kế hoạch, Hawick 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Kế hoạch, Inverness 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Kế hoạch, Irvine 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Jedburgh 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Kế hoạch, Kelso 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Kế hoạch, Kilmarnock 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Kế hoạch, Kirkcaldy 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Kế hoạch, Kirkcaldy 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Kế hoạch, Kirkcudbright 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Kirkcudbright năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Kế hoạch, Kirkintilloch 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Kế hoạch, Kirriemuir 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Lanark 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Kế hoạch, Linlithgow 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "OS Town Kế hoạch, Mayole 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Kế hoạch, Montrose 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Kế hoạch, Musselburgh 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Musselburgh năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Kế hoạch, Nairn 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Kế hoạch, Oban 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Kế hoạch, Peebles 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Kế hoạch, Perth 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Kế hoạch, Peterhead 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "hệ điều hành kế hoạch Town, Port Glasgow 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Kế hoạch, Portobello 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Kế hoạch, Rothesay 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Kế hoạch, Selkirk 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Kế hoạch, St Andrews 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Kế hoạch, St Andrews năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Stirling 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Kế hoạch, Stonehaven 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Kế hoạch, Stranraer 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Kế hoạch, Stranraer 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Kế hoạch, Stranraer năm 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Kế hoạch, Strathaven 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Kế hoạch, Wick 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Kế hoạch, Wigtown 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Kế hoạch, Wigtown 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233.055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -24328,6 +24966,9 @@ msgstr "Seafood"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "Deli (Fine Food)"
 
@@ -26613,6 +27254,9 @@ msgstr "{0} phải là một số nguyên dương"
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "mối quan hệ không có loại"
 
@@ -27614,6 +28258,9 @@ msgstr ""
 msgid "Import"
 msgstr "nhập khẩu"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -28569,6 +29216,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -28578,6 +29248,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -33335,24 +34008,6 @@ msgstr "Sign {0}"
 msgid "Additional sign {0}"
 msgstr "dấu hiệu khác {0}"
 
-msgid "Edit relation"
-msgstr "Edit mối quan hệ"
-
-msgid "Edit relations"
-msgstr "Edit quan hệ"
-
-msgid "No relation is selected"
-msgstr "Không quan hệ được lựa chọn"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hủy bỏ nút '' {0} '' ở vị trí {1} từ mối quan hệ '' {2} ''"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hủy bỏ cách '' {0} '' ở vị trí {1} từ mối quan hệ '' {2} ''"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Hủy bỏ mối quan hệ '' {0} '' ở vị trí {1} từ mối quan hệ '' {2} ''"
-
 msgid "routing active route"
 msgstr "định tuyến đường hoạt động"
 
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 059a1ab..9016a73 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-03-09 22:17+0000\n"
 "Last-Translator: Simon Legner <Unknown>\n"
 "Language-Team: Walser <wae at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:18+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:20+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -5390,6 +5390,23 @@ msgid_plural "Their version ({0} entries)"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "My version (local dataset)"
+msgstr ""
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr ""
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+
+msgid "Their version (server dataset)"
+msgstr ""
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr ""
+
 msgid "My with Their"
 msgstr ""
 
@@ -5472,33 +5489,22 @@ msgstr ""
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
+msgid "(none)"
 msgstr ""
 
-msgid "Properties in their dataset, i.e. the server dataset"
+msgid "deleted"
 msgstr ""
 
-msgid "Coordinates:"
+msgid "not deleted"
 msgstr ""
 
 msgid "Deleted State:"
 msgstr ""
 
-msgid "Referenced by:"
-msgstr ""
-
-msgid "(none)"
-msgstr ""
-
-msgid "deleted"
+msgid "Coordinates:"
 msgstr ""
 
-msgid "not deleted"
+msgid "Referenced by:"
 msgstr ""
 
 msgid "Keep my coordinates"
@@ -5546,12 +5552,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-msgid "My version (local dataset)"
-msgstr ""
-
-msgid "Their version (server dataset)"
-msgstr ""
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
@@ -10115,9 +10115,6 @@ msgstr ""
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
@@ -11814,7 +11811,7 @@ msgstr ""
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgid "<i>CH1903 / LV03</i>"
 msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -13083,7 +13080,12 @@ msgstr ""
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14200,9 +14202,6 @@ msgstr ""
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr ""
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr ""
 
@@ -14212,9 +14211,6 @@ msgstr ""
 msgid "You are running version {0} of Java."
 msgstr ""
 
-msgid "April 2015"
-msgstr ""
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14225,9 +14221,17 @@ msgid ""
 "update to Java {0}."
 msgstr ""
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr ""
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14810,6 +14814,12 @@ msgstr ""
 msgid "Mapbox Satellite"
 msgstr ""
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr ""
 
@@ -14837,6 +14847,9 @@ msgstr ""
 msgid "OpenStreetMap GPS Traces"
 msgstr ""
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr ""
 
@@ -14867,6 +14880,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14915,21 +14931,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -14971,15 +14998,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr ""
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr ""
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -14995,6 +15037,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15100,9 +15148,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15112,6 +15166,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15196,9 +15253,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15214,31 +15298,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15257,13 +15370,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15272,21 +15385,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15305,6 +15428,9 @@ msgstr ""
 msgid "BANO"
 msgstr ""
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15317,6 +15443,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr ""
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15444,16 +15573,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15486,15 +15620,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15506,15 +15650,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15575,18 +15735,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15650,18 +15829,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15695,26 +15885,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15724,15 +15923,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15740,6 +15953,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15878,23 +16094,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15921,18 +16149,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -15966,6 +16210,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16044,12 +16291,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr ""
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr ""
 
@@ -16105,8 +16360,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16130,345 +16385,731 @@ msgid "WA 2013 aerial imagery for San Juan County"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
-"WA. Resolution is 9 inch."
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
+msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgstr ""
+
+msgid "OS 1:25k historic (OSM-Limited)"
+msgstr ""
+
+msgid "OS Scottish Popular historic"
+msgstr ""
+
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Annan 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
+msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgstr ""
+
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA 2016 aerial imagery for San Juan County"
+msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain aerial imagery taken in May, June, and July from San Juan "
-"County, WA. Resolution is 6 inch countywide."
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "WA Vector Streetmap for San Juan County"
+msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr ""
 
 msgid ""
-"Public domain street and address data from the San Juan County, WA. Updated "
-"at least quarterly."
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Texas Orthophoto"
+msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr ""
 
-msgid "Philadelphia 2015 Imagery"
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Latest 6 Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr ""
 
-msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Three Inch Aerial Imagery"
+msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
 msgid ""
-"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
-"Annapolis"
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "MD Transportation Basemap"
+msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr ""
 
 msgid ""
-"Maryland State Highway Administration road features and additional Maryland "
-"focused landmarks"
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Delaware 2012 Orthophotography"
+msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Orthophotomaps 2012"
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr ""
 
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "7th Series (OS7)"
+msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr ""
 
-msgid "OS New Popular Edition historic"
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS OpenData StreetView"
+msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr ""
 
-msgid "OS OpenData Locator"
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "Surrey Air Survey"
+msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr ""
 
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "NLS - OS 25-inch (Scotland) 1892-1905"
+msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr ""
 
-msgid "OS 1:25k historic (OSM-Limited)"
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Scottish Popular historic"
+msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr ""
 
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
+msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Airdrie 1858 (NLS)"
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Alexandria 1859 (NLS)"
+msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Annan 1859 (NLS)"
+msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Arbroath 1858 (NLS)"
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Ayr 1855 (NLS)"
+msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Brechin 1862 (NLS)"
+msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Burntisland 1894 (NLS)"
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Campbelton 1865 (NLS)"
+msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Coatbridge 1858 (NLS)"
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1852 (NLS)"
+msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dalkeith 1893 (NLS)"
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumbarton 1859 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1850 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dumfries 1893 (NLS)"
+msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1854 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Dunfermline 1894 (NLS)"
+msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
+msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
+msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Elgin 1868 (NLS)"
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
+msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Forres 1868 (NLS)"
+msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Galashiels 1858 (NLS)"
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Girvan 1857 (NLS)"
+msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
+msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Greenock 1857 (NLS)"
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1853 (NLS)"
+msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Haddington 1893 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Hamilton 1858 (NLS)"
+msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
+msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Irvine 1859 (NLS)"
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Jedburgh 1858 (NLS)"
+msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kelso 1857 (NLS)"
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
+msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
+msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
+msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Lanark 1858 (NLS)"
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Linlithgow 1856 (NLS)"
+msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
+msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1853 (NLS)"
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Musselburgh 1893 (NLS)"
+msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peebles 1856 (NLS)"
+msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Perth 1860 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Peterhead 1868 (NLS)"
+msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
+msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Selkirk 1865 (NLS)"
+msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1854 (NLS)"
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, St Andrews 1893 (NLS)"
+msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stirling 1858 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stonehaven 1864 (NLS)"
+msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1847 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
+msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr ""
 
-msgid "OS Town Plans, Stranraer 1893 (NLS)"
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
 msgstr ""
 
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr ""
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23054,6 +23695,9 @@ msgstr ""
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr ""
 
@@ -25299,6 +25943,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr ""
 
@@ -26271,6 +26918,9 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27123,6 +27773,29 @@ msgstr ""
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27132,6 +27805,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31669,24 +32345,6 @@ msgstr ""
 msgid "Additional sign {0}"
 msgstr ""
 
-msgid "Edit relation"
-msgstr ""
-
-msgid "Edit relations"
-msgstr ""
-
-msgid "No relation is selected"
-msgstr ""
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 97fe78a..badfec1 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2016-10-23 14:49+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
 "Language-Team: 汉语 <>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:16+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:18+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: zh_CN\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5385,6 +5385,23 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "他们的版本({0} 个项目)"
 
+msgid "My version (local dataset)"
+msgstr "我的版本(本地数据集合)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "我的数据集合的属性,即本地数据集合"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr "合并元件的属性。当合并的决定被接受时它们会取代我的元件中的属性。"
+
+msgid "Their version (server dataset)"
+msgstr "他们的版本(服务器数据集合)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "他们的数据集合的属性,即服务器数据集合"
+
 msgid "My with Their"
 msgstr "我的与他们的"
 
@@ -5465,26 +5482,6 @@ msgstr "节点"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "合并的节点尚未冻结。不能建立决议命令。"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "我的数据集合的属性,即本地数据集合"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr "合并元件的属性。当合并的决定被接受时它们会取代我的元件中的属性。"
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "他们的数据集合的属性,即服务器数据集合"
-
-msgid "Coordinates:"
-msgstr "坐标:"
-
-msgid "Deleted State:"
-msgstr "删除的状态:"
-
-msgid "Referenced by:"
-msgstr "参照于:"
-
 msgid "(none)"
 msgstr "(没有)"
 
@@ -5494,6 +5491,15 @@ msgstr "已删除"
 msgid "not deleted"
 msgstr "未删除"
 
+msgid "Deleted State:"
+msgstr "删除的状态:"
+
+msgid "Coordinates:"
+msgstr "坐标:"
+
+msgid "Referenced by:"
+msgstr "参照于:"
+
 msgid "Keep my coordinates"
 msgstr "保持我的坐标"
 
@@ -5539,12 +5545,6 @@ msgstr "设定键"
 msgid "Value"
 msgstr "数值"
 
-msgid "My version (local dataset)"
-msgstr "我的版本(本地数据集合)"
-
-msgid "Their version (server dataset)"
-msgstr "他们的版本(服务器数据集合)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "保留本地数据集合中选定的设定键/数值配对"
 
@@ -10166,9 +10166,6 @@ msgstr "关闭对话框,并取消授权"
 msgid "Close the dialog and accept the Access Token"
 msgstr "关闭对话框,并应用访问令牌"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr "取消运行中的 OAuth 操作失败"
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "正在从“{0}”取回 OAuth 要求令牌"
 
@@ -11893,8 +11890,8 @@ msgstr "PUWG 区"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid(瑞士)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903/ LV03(无本地校正)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "瓜德罗普岛堡马里戈特 1949"
@@ -13167,10 +13164,13 @@ msgstr "读取已取消"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
-"元素上缺少强制属性“bounds”。得到 "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "删除的路径 {0} 包含节点"
@@ -14302,9 +14302,6 @@ msgstr "正在打开 URL:{0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL 不包含{0}/{1}/{2}"
 
-msgid "reserved"
-msgstr "保留"
-
 msgid "Outdated Java version"
 msgstr "过时的 Java 版本"
 
@@ -14314,9 +14311,6 @@ msgstr "升级 Java"
 msgid "You are running version {0} of Java."
 msgstr "您正在运行 Java 版本 {0}。"
 
-msgid "April 2015"
-msgstr "2015 年 4 月"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14327,9 +14321,17 @@ msgid ""
 "update to Java {0}."
 msgstr "JOSM 即将停止支持这一 Java 版本,强烈建议您升级至 Java {0}。"
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "您希望立即更新吗?"
 
+msgid "reserved"
+msgstr "保留"
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14915,6 +14917,12 @@ msgstr "HDM (人道主义 OSM 团队)"
 msgid "Mapbox Satellite"
 msgstr "Mapbox 卫星"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -14942,6 +14950,9 @@ msgstr "OpenStreetMap (德国样式)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OSM GPS 轨迹"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "公共交通(ÖPNV)"
 
@@ -14972,6 +14983,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr "定位符叠加层"
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr "质量控制(QA)地址"
 
@@ -15020,21 +15034,32 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15076,15 +15101,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr ""
 
@@ -15100,6 +15140,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr ""
 
@@ -15205,9 +15251,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15217,6 +15269,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15301,9 +15356,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr ""
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15319,31 +15401,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr ""
 
@@ -15362,13 +15473,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15377,21 +15488,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
+msgid "Stevns"
 msgstr ""
 
-msgid "Vejmidte (Denmark)"
+msgid "Vejmidte"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15410,6 +15531,9 @@ msgstr ""
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15422,6 +15546,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15549,16 +15676,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15591,15 +15723,25 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15611,15 +15753,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15680,18 +15838,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15755,18 +15932,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr ""
 
@@ -15800,26 +15988,35 @@ msgstr ""
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15829,15 +16026,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15845,6 +16056,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15983,23 +16197,35 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -16026,18 +16252,34 @@ msgstr ""
 msgid "City of Cape Town 2013 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr ""
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16071,6 +16313,9 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
 
@@ -16149,12 +16394,20 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "台湾电子地图开放数据"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "台湾电子地图开放数据(带等高线)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "台湾村界"
 
@@ -16210,8 +16463,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16286,9 +16539,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -16340,240 +16604,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "OS Town Plans,阿伯丁(Aberdeen) 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "OS Town Plans,艾尔德里(Airdrie) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "OS Town Plans,亚历山大(Alexandria) 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "OS Town Plans,阿洛厄(Alloa) 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "OS Town Plans,安南(Annan) 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "OS Town Plans,阿布罗斯(Arbroath) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "OS Town Plans,埃尔(Ayr) 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "OS Town Plans,特威德河畔贝里克(Berwick-upon-Tweed) 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "OS Town Plans,布里金(Brechin) 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "OS Town Plans,本泰兰(Burntisland) 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "OS Town Plans,堪布尔顿(Campbelton) 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "OS Town Plans,科特布里奇(Coatbridge) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "OS Town Plans,库珀(Cupar) 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "OS Town Plans,库珀(Cupar) 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "OS Town Plans,达尔基斯(Dalkeith) 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "OS Town Plans,达尔基斯(Dalkeith) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "OS Town Plans,敦巴顿(Dumbarton) 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "OS Town Plans,邓弗里斯(Dumfries) 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "OS Town Plans,邓弗里斯(Dumfries) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "OS Town Plans,邓迪(Dundee) 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "OS Town Plans,邓迪(Dundee) 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "OS Town Plans,邓弗姆林(Dunfermline) 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "OS Town Plans,邓弗姆林(Dunfermline) 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "OS Town Plans,爱丁堡(Edinburgh) 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "OS Town Plans,爱丁堡(Edinburgh) 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "OS Town Plans,爱丁堡(Edinburgh) 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "OS Town Plans,埃尔金(Elgin) 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "OS Town Plans,福尔柯克(Falkirk) 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "OS Town Plans,福弗尔(Forfar) 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "OS Town Plans,福里斯(Forres) 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "OS Town Plans,加拉希尔斯(Galashiels) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "OS Town Plans,格文(Girvan) 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "OS Town Plans,格拉斯哥(Glasgow) 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "OS Town Plans,格拉斯哥(Glasgow) 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "OS Town Plans,格里诺克(Greenock) 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "OS Town Plans,哈丁顿(Haddington) 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "OS Town Plans,哈丁顿(Haddington) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "OS Town Plans,汉密尔顿(Hamilton) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "OS Town Plans,霍伊克(Hawick) 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "OS Town Plans,因弗内斯(Inverness) 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "OS Town Plans,尔湾(Irvine) 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "OS Town Plans,杰德堡(Jedburgh) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "OS Town Plans,凯尔索(Kelso) 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "OS Town Plans,基尔马诺克(Kilmarnock) 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "OS Town Plans,柯科迪(Kirkcaldy) 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "OS Town Plans,柯科迪(Kirkcaldy) 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "OS Town Plans,柯库布里(Kirkcudbright) 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "OS Town Plans,柯库布里(Kirkcudbright) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "OS Town Plans,柯金蒂洛赫(Kirkintilloch) 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "OS Town Plans,基里缪尔(Kirriemuir) 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "OS Town Plans,拉纳克(Lanark) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "OS Town Plans,林利斯戈(Linlithgow) 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr ""
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans,蒙特罗斯(Montrose) 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "OS Town Plans,马瑟尔堡(Musselburgh) 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "OS Town Plans,马瑟尔堡(Musselburgh) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "OS Town Plans,奈恩(Nairn) 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "OS Town Plans,奥本(Oban) 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "OS Town Plans,佩斯利(Paisley) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "OS Town Plans,皮布尔斯(Peebles) 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "OS Town Plans,珀斯(Perth) 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "OS Town Plans,彼得黑德(Peterhead) 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "OS Town Plans,格拉斯哥港(Port Glasgow) 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "OS Town Plans,波托贝洛(Portobello) 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "OS Town Plans,罗斯西(Rothesay) 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "OS Town Plans,塞尔扣克(Selkirk) 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "OS Town Plans,圣安德鲁斯(St Andrews) 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "OS Town Plans,圣安德鲁斯(St Andrews) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "OS Town Plans,斯特林(Stirling) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "OS Town Plans,斯通黑文(Stonehaven) 1864 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "OS Town Plans,斯特兰拉尔(Stranraer) 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Town Plans,斯特兰拉尔(Stranraer) 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "OS Town Plans,斯特兰拉尔(Stranraer) 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "OS Town Plans,斯特雷文(Strathaven) 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "OS Town Plans,维克(Wick) 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "OS Town Plans,威格敦(Wigtown) 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "OS Town Plans,威格敦(Wigtown) 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23161,6 +23800,9 @@ msgstr "海鲜"
 msgid "Dairy"
 msgstr ""
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "熟食店(美食)"
 
@@ -25406,6 +26048,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "没有类型的关系"
 
@@ -26386,6 +27031,9 @@ msgstr ""
 msgid "Import"
 msgstr "输入"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27308,6 +27956,29 @@ msgstr "调试"
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27317,6 +27988,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31897,24 +32571,6 @@ msgstr "路标 {0}"
 msgid "Additional sign {0}"
 msgstr "额外路标 {0}"
 
-msgid "Edit relation"
-msgstr "编辑关系"
-
-msgid "Edit relations"
-msgstr "编辑关系"
-
-msgid "No relation is selected"
-msgstr "尚未选定关系"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "从关系“{2}”删除位置 {1} 的节点“{0}”"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "从关系“{2}”删除位置 {1} 的路径“{0}”"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "从关系“{2}”删除位置 {1} 的关系“{0}”"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 05a6461..e66a548 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"POT-Creation-Date: 2017-05-28 03:43+0200\n"
 "PO-Revision-Date: 2017-04-30 22:15+0000\n"
 "Last-Translator: Wayne Su <Unknown>\n"
 "Language-Team: Traditional Chinese\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-05-03 05:15+0000\n"
-"X-Generator: Launchpad (build 18366)\n"
+"X-Launchpad-Export-Date: 2017-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 18391)\n"
 "Language: zh_TW\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5373,6 +5373,23 @@ msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
 msgstr[0] "他們的版本 ({0} 個項目)"
 
+msgid "My version (local dataset)"
+msgstr "我的版本 (本地端資料組合)"
+
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "我的資料組合的屬性,例如本地端資料組合"
+
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr "合併元件的屬性。當合併的決定被接受時它們會取代我的元件中的屬性。"
+
+msgid "Their version (server dataset)"
+msgstr "他們的版本 (伺服器資料組合)"
+
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "他們的資料組合的屬性,例如伺服器資料組合"
+
 msgid "My with Their"
 msgstr "我的與他們的"
 
@@ -5453,26 +5470,6 @@ msgstr "節點"
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "合併的節點尚未凍結。不能建置決議指令"
 
-msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "我的資料組合的屬性,例如本地端資料組合"
-
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr "合併元件的屬性。當合併的決定被接受時它們會取代我的元件中的屬性。"
-
-msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "他們的資料組合的屬性,例如伺服器資料組合"
-
-msgid "Coordinates:"
-msgstr "坐標:"
-
-msgid "Deleted State:"
-msgstr "刪除的狀態:"
-
-msgid "Referenced by:"
-msgstr "參照於:"
-
 msgid "(none)"
 msgstr "(沒有)"
 
@@ -5482,6 +5479,15 @@ msgstr "已刪除"
 msgid "not deleted"
 msgstr "未刪除"
 
+msgid "Deleted State:"
+msgstr "刪除的狀態:"
+
+msgid "Coordinates:"
+msgstr "坐標:"
+
+msgid "Referenced by:"
+msgstr "參照於:"
+
 msgid "Keep my coordinates"
 msgstr "保留我的坐標"
 
@@ -5527,12 +5533,6 @@ msgstr "設定鍵"
 msgid "Value"
 msgstr "數值"
 
-msgid "My version (local dataset)"
-msgstr "我的版本 (本地端資料組合)"
-
-msgid "Their version (server dataset)"
-msgstr "他們的版本 (伺服器資料組合)"
-
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "保留本地端資料組合中選取的設定鍵/數值配對"
 
@@ -10119,9 +10119,6 @@ msgstr "關閉對話盒並取消授權"
 msgid "Close the dialog and accept the Access Token"
 msgstr "關閉對話盒並套用存取記號"
 
-msgid "Failed to cancel running OAuth operation"
-msgstr ""
-
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "正從「{0}」取回 OAuth 要求記號"
 
@@ -11844,8 +11841,8 @@ msgstr "PUWG 區"
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (瑞士)"
 
-msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (沒有本地校正)</i>"
+msgid "<i>CH1903 / LV03</i>"
+msgstr ""
 
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13118,7 +13115,12 @@ msgstr "讀取已被取消"
 
 msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
+msgstr ""
+
+msgid ""
+"Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
+"''{1}'', ''{2}''."
 msgstr ""
 
 msgid "Deleted way {0} contains nodes"
@@ -14245,9 +14247,6 @@ msgstr "正在開啟 URL 網址:{0}"
 msgid "URL does not contain {0}/{1}/{2}"
 msgstr "URL 網址缺少 {0}/{1}/{2}"
 
-msgid "reserved"
-msgstr ""
-
 msgid "Outdated Java version"
 msgstr "過期的 JAVA 版本"
 
@@ -14257,9 +14256,6 @@ msgstr "更新 JAVA"
 msgid "You are running version {0} of Java."
 msgstr "你使用的 JAVA 版本是 {0}"
 
-msgid "April 2015"
-msgstr "2015 四月"
-
 msgid ""
 "This version is no longer supported by {0} since {1} and is not recommended "
 "for use."
@@ -14270,9 +14266,17 @@ msgid ""
 "update to Java {0}."
 msgstr "JOSM 之後會不能在這版本下執行,我們非常建議你更新到 JAVA {0}。"
 
+msgid ""
+"You may face critical Java bugs; we highly recommend you to update to Java "
+"{0}."
+msgstr ""
+
 msgid "Would you like to update now ?"
 msgstr "你想要現在就更新嗎?"
 
+msgid "reserved"
+msgstr ""
+
 msgid ""
 "A previous version of JOSM has installed a custom certificate in order to "
 "provide HTTPS support for Remote Control:"
@@ -14854,6 +14858,12 @@ msgstr "人道救援開放街圖小組"
 msgid "Mapbox Satellite"
 msgstr "Mapbox 衛星圖"
 
+msgid "DigitalGlobe Premium Imagery"
+msgstr ""
+
+msgid "DigitalGlobe Standard Imagery"
+msgstr ""
+
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
@@ -14881,6 +14891,9 @@ msgstr "OpenStreetMap (德國樣式)"
 msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS 軌跡"
 
+msgid "Public GPS traces uploaded to OpenStreetMap."
+msgstr ""
+
 msgid "Public Transport (ÖPNV)"
 msgstr "大眾運輸 (ÖPNV)"
 
@@ -14911,6 +14924,9 @@ msgstr ""
 msgid "Locator Overlay"
 msgstr ""
 
+msgid "Shows major features to help orient you."
+msgstr ""
+
 msgid "QA No Address"
 msgstr ""
 
@@ -14959,21 +14975,32 @@ msgstr "OSM 檢驗工具:海岸線 (EU)"
 msgid "imagico.de OSM images for mapping: Prokletije Mountains"
 msgstr ""
 
+msgid ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
 msgstr ""
 
+msgid ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Pensacola Mountains"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
 msgstr ""
 
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
 msgstr ""
 
-msgid ""
-"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
-"Land and Kemp Coast early 2017"
+msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
 msgid "IGN Argentina (TMS)"
@@ -15015,15 +15042,30 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Northwest Heard Island"
 msgstr ""
 
+msgid ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Heard Island coast"
 msgstr ""
 
+msgid ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true color)"
+msgstr ""
+
 msgid "basemap.at"
 msgstr "奧地利 basemap.at"
 
+msgid "Basemap of Austria, based on goverment data."
+msgstr ""
+
 msgid "basemap.at Orthofoto"
 msgstr "奧地利 basemap.at 正射影像"
 
+msgid "Orthofoto layer provided by basemap.at. "
+msgstr ""
+
 msgid "Geoimage.at MaxRes"
 msgstr "奧地利 Geoimage.at MaxRes"
 
@@ -15039,6 +15081,12 @@ msgstr ""
 msgid "Tiris: contour lines"
 msgstr ""
 
+msgid "Tiris: orthophoto"
+msgstr ""
+
+msgid "Tiris: orthophoto infrared"
+msgstr ""
+
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "越南:一般使用"
 
@@ -15144,9 +15192,15 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Cotonou"
 msgstr ""
 
+msgid "Patchy and partly cloudy coverage in usual sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bouvet Island"
 msgstr ""
 
+msgid "For more accurate coastline and glacier mapping (true color)"
+msgstr ""
+
 msgid "IBGE Mapa de Setores Urbanos"
 msgstr ""
 
@@ -15156,6 +15210,9 @@ msgstr ""
 msgid "IBGE Distrito Federal"
 msgstr ""
 
+msgid "Addresses data from IBGE"
+msgstr ""
+
 msgid "Rio Mosaic 2013"
 msgstr ""
 
@@ -15240,9 +15297,36 @@ msgstr ""
 msgid "DER-ES"
 msgstr "DER-ES"
 
+msgid "IBGE-BC250-Aglomerado Rural Isolado"
+msgstr ""
+
+msgid "IBGE-BC250-Pista de Pouso"
+msgstr ""
+
+msgid "IBGE-BC250-Rios Drenagem"
+msgstr ""
+
 msgid "IBGE-BC250-Trecho Rodoviario"
 msgstr ""
 
+msgid "IBGE-BC250-Terra Indigena"
+msgstr ""
+
+msgid "IBGE-BC250-Terra Publico (Militar)"
+msgstr ""
+
+msgid "IBGE-BC250-Unidade de Uso Sistentável - APA"
+msgstr ""
+
+msgid "IBGE-BC250-Villa"
+msgstr ""
+
+msgid "IBGE-BCIM-Estações Geradora de Energia Elétrica"
+msgstr ""
+
+msgid "IBGE-BCIM-Município"
+msgstr ""
+
 msgid "Geobase Hydrography"
 msgstr ""
 
@@ -15258,31 +15342,60 @@ msgstr ""
 msgid "Latest southwest British Columbia Landsat"
 msgstr ""
 
+msgid ""
+"Recent lower-resolution landsat imagery for southwest British Columbia"
+msgstr ""
+
 msgid "Kelowna 2012"
 msgstr ""
 
+msgid "High quality aerial imagery taken for the City of Kelowna"
+msgstr ""
+
 msgid "Kelowna Roads overlay"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
 msgstr ""
 
+msgid "Coastline mostly mapped meanwhile (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
 msgstr ""
 
 msgid ""
+"Assembled from July 2012 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
 msgstr ""
 
+msgid ""
+"Assembled from July 2016 ASTER imagery (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
 msgstr ""
 
+msgid "Image from after the 2014/2015 eruption (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Isla Londonderry"
 msgstr ""
 
+msgid ""
+"A lot of very coarse coastlines could be improved here, much snow cover "
+"though so no use for glacier mapping (false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Volcán Calbuco"
 msgstr ""
 
+msgid "Image from after the 2015 eruption (true color)"
+msgstr ""
+
 msgid "Czech CUZK:KM"
 msgstr "捷克 CUZK:KM"
 
@@ -15301,13 +15414,13 @@ msgstr ""
 msgid "Praha IPR low-vegetation orthophoto"
 msgstr ""
 
-msgid "Geodatastyrelsen (Denmark)"
+msgid "SDFE aerial imagery"
 msgstr ""
 
-msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
+msgid "SDFE Cadastral Parcels INSPIRE View"
 msgstr ""
 
-msgid "Geodatastyrelsen DTK Kort25"
+msgid "SDFE DTK Kort25"
 msgstr ""
 
 msgid "SDFE Terræn Skyggekort (40 cm)"
@@ -15316,21 +15429,31 @@ msgstr ""
 msgid "SDFE Overflade Skyggekort (40 cm)"
 msgstr ""
 
-msgid "Geodatastyrelsen Skærmkort"
+msgid "SDFE Skærmkort"
 msgstr ""
 
-msgid "Stevns (Denmark)"
-msgstr "丹麥 Route 500"
+msgid "Stevns"
+msgstr ""
 
-msgid "Vejmidte (Denmark)"
-msgstr "丹麥 Vejmidte"
+msgid "Vejmidte"
+msgstr ""
 
 msgid "imagico.de OSM images for mapping: El Altar"
 msgstr ""
 
+msgid ""
+"2007 ASTER image offering better glacier coverage than common sources (true "
+"color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
+msgid ""
+"Recent image, only old and poor images in other sources currently (true "
+"color)"
+msgstr ""
+
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
@@ -15349,6 +15472,9 @@ msgstr ""
 msgid "BANO"
 msgstr "BANO"
 
+msgid "French address registry or Base Adresses Nationale"
+msgstr ""
+
 msgid "BD Carthage"
 msgstr ""
 
@@ -15361,6 +15487,9 @@ msgstr ""
 msgid "Cadastre"
 msgstr "Cadastre"
 
+msgid "French land registry"
+msgstr ""
+
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr ""
 
@@ -15488,16 +15617,21 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (true color)"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Northern German west coast tidalflats "
 "(infrared)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid ""
+"Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
+"and shoals (false color IR)"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Up-to-date low tide imagery of the coast for "
-"updating mapping of tidalflats and shoals"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -15530,15 +15664,25 @@ msgstr "德國美茵茲最新空照影像 60cm"
 msgid "imagico.de OSM images for mapping: Qasigiannguit"
 msgstr ""
 
+msgid "Icebridge DMS image of the settlement - alignment might be poor"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Thule Air Base"
 msgstr ""
 
+msgid "Icebridge DMS image - alignment might be poor"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
 "September 2015"
 msgstr ""
 
 msgid ""
+"Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
+msgstr ""
+
+msgid ""
 "imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
 "2015"
 msgstr ""
@@ -15550,15 +15694,31 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Greenland mosaic"
 msgstr ""
 
+msgid "Landsat mosaic of Greenland (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
 msgstr ""
 
+msgid ""
+"First available image north of the regular Landsat limit, mostly with "
+"seasonal snow cover so difficult to interpret (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
 msgstr ""
 
+msgid "Latest images north of the regular Landsat limit (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
 msgstr ""
 
+msgid ""
+"Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
+"northeast (true color with estimated blue)"
+msgstr ""
+
 msgid "Drone Imagery (Haiti)"
 msgstr ""
 
@@ -15619,18 +15779,37 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Eastern Iceland"
 msgstr ""
 
+msgid "Missing islets and inaccurate coast (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rann of Kutch"
 msgstr ""
 
+msgid ""
+"Land/water distinction difficult to properly map based on Bing/Mapbox images "
+"(false color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
 msgstr ""
 
+msgid ""
+"Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
+"also use additional detail (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Bakun Reservoir"
 msgstr ""
 
+msgid "Missing in older pre-2011 images (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Batam"
 msgstr ""
 
+msgid "Missing Islands in OSM (true color)"
+msgstr ""
+
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr ""
 
@@ -15694,18 +15873,29 @@ msgstr ""
 msgid "South Tyrol Orthofoto 2011 (highres)"
 msgstr ""
 
+msgid ""
+"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
+"valleys)"
+msgstr ""
+
 msgid "South Tyrol Orthofoto 2014"
 msgstr ""
 
 msgid "South Tyrol Topomap"
 msgstr ""
 
+msgid "Topographical basemap of South Tyrol"
+msgstr ""
+
 msgid "Japan GSI ortho Imagery"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
 msgstr ""
 
+msgid "Up-to-date image for glacier mapping (true color)"
+msgstr ""
+
 msgid "USSR - Latvia"
 msgstr "蘇聯 - 拉托維亞"
 
@@ -15739,26 +15929,35 @@ msgstr "盧森堡Inspire Water"
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
 
-msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
+msgid "PDOK Luchtfoto Beeldmateriaal 25cm"
 msgstr ""
 
 msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
 msgstr ""
 
+msgid "LINZ NZ Aerial Imagery"
+msgstr ""
+
+msgid "LINZ NZ Topo50 Gridless Maps"
+msgstr ""
+
 msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
 msgstr ""
 
-msgid ""
-"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
-"Svalbard"
+msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
 msgid "imagico.de OSM images for mapping: Western Karakoram"
 msgstr ""
 
+msgid ""
+"Represents approximately minimum snow cover so can be well used for glacier "
+"mapping (true color)"
+msgstr ""
+
 msgid "Gaza Strip - Pléiades - 2014/07/06"
 msgstr ""
 
@@ -15768,15 +15967,29 @@ msgstr ""
 msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
 msgstr ""
 
+msgid ""
+"New locks with less clouds than in the Sentinel-2 image - make sure to check "
+"image alignment (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Panama Canal"
 msgstr ""
 
+msgid "Images of the new locks (but partly cloudy) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Vanatinai"
 msgstr ""
 
+msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: New Ireland"
 msgstr ""
 
+msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Coropuna"
 msgstr ""
 
@@ -15784,6 +15997,9 @@ msgid ""
 "imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
+msgid "Poor and outdated imagery in other sources (true color)"
+msgstr ""
+
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
 
@@ -15922,23 +16138,35 @@ msgstr "俄羅斯 ScanEx SPOT"
 msgid "imagico.de OSM images for mapping: Kerch Strait"
 msgstr ""
 
+msgid "State of bridge construction in August 2016 (true color)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
 msgstr ""
 
+msgid "Up-to-date late summer imagery with few clouds (true color)"
+msgstr ""
+
 msgid ""
 "imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
 "2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid ""
+"Up-to-date late summer imagery with few clouds - caution: not all visible "
+"snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
 msgstr ""
 
-msgid ""
-"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
-"autumn 2016"
+msgid "Recent image showing newest features (true color)"
 msgstr ""
 
 msgid "Freemap.sk Car"
@@ -15965,18 +16193,34 @@ msgstr "RABA-KGZ:斯洛維尼亞建築區域"
 msgid "City of Cape Town 2013 Aerial"
 msgstr "開普敦市 2013 空照"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 12cm ground sample distance"
+msgstr ""
+
 msgid "City of Cape Town 2015 Aerial"
 msgstr "開普敦市 2015 空照"
 
+msgid ""
+"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
+"municipal area. 8cm ground sample distance"
+msgstr ""
+
 msgid "South Africa CD:NGI Aerial"
 msgstr "南非 CD:NGI 空照"
 
 msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
 msgstr ""
 
+msgid "Missing in other image sources (true color with estimated blue)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Scott Island"
 msgstr ""
 
+msgid "Missing in other image sources (true color)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
 msgstr ""
 
@@ -16010,6 +16254,9 @@ msgstr "西班牙 GRAFCAN Express - 加那利群島"
 msgid "imagico.de OSM images for mapping: Adams Bridge"
 msgstr ""
 
+msgid "Supplementing incomplete coverage in other sources (true color)"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "瑞士 阿爾高州 25cm (AGIS 2011)"
 
@@ -16088,12 +16335,20 @@ msgstr "瑞士巴塞爾鄉村州 10cm 2015"
 msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
 msgstr ""
 
+msgid ""
+"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
+"altitudes (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "台灣通用電子地圖開放資料版"
 
 msgid "Taiwan e-Map Open Data (with Contour Line)"
 msgstr "台灣通用電子地圖開放資料版 (含等高線)"
 
+msgid "The emap from Taiwan National Land Surveying and Mapping Center"
+msgstr ""
+
 msgid "Taiwan Village Boundaries"
 msgstr "台灣村里界圖"
 
@@ -16149,8 +16404,8 @@ msgid "imagico.de OSM images for mapping: Alaska Range"
 msgstr ""
 
 msgid ""
-"234 channels (true color), Recent summer image of the Alaska Range for "
-"mapping natural features"
+"Recent summer image of the Alaska Range for mapping natural features (true "
+"color)"
 msgstr ""
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
@@ -16225,9 +16480,20 @@ msgstr ""
 msgid "Delaware 2012 Orthophotography"
 msgstr ""
 
+msgid ""
+"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
+"4-band true color and near infrared (R, G, B, IR) orthoimages covering New "
+"Castle, Kent and Sussex Counties in Delaware."
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
 msgstr ""
 
+msgid ""
+"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
+"color IR)"
+msgstr ""
+
 msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
 msgstr ""
 
@@ -16279,240 +16545,615 @@ msgstr ""
 msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 亞伯丁 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Airdrie 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 埃爾德里 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alexandria 1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 亞歷山德里亞 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Alexandria 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 阿洛亞 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Annan 1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 安南 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Arbroath 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 阿布羅斯 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Arbroath 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Ayr 1855 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 亞伯丁 1866-1867 (NLS)"
 
+msgid ""
+"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 特韋德河畔伯立克 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Brechin 1862 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 布里金 1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Burntisland 1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 奔提斯蘭 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Burntisland 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Campbelton 1865 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 坎貝爾城 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Campbelton 1865, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Coatbridge 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 科特布里奇 11858 (NLS)"
 
+msgid ""
+"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1854 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 庫珀 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 庫珀 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1852 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 達爾基斯 1852 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dalkeith 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 達爾基斯 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumbarton 1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 敦巴頓 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1850 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 鄧弗里斯 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dumfries 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 鄧弗里斯 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Dumfries 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 丹地 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 丹地 1870-1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1854 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 鄧弗姆林 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Dunfermline 1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 鄧弗姆林 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1849-1851 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1876-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1940s-1960s (NLS)"
 
+msgid ""
+"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Elgin 1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 埃爾金 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 福爾柯克 1858-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 弗福爾 1860-1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Forres 1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 福里斯 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Galashiels 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 加拉希爾斯 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Galashiels 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Girvan 1857 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 格文 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥 1892-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Greenock 1857 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 格林諾克 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Greenock 1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1853 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 哈丁敦 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Haddington 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 哈丁敦 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Haddington 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hamilton 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 漢密爾頓 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hamilton 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 霍伊克 1857-1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 因弗尼斯 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Irvine 1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 歐文 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Jedburgh 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 傑德堡 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kelso 1857 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 凱爾索 1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 基爾馬諾克 1857-1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 柯科迪 1855 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 柯科迪 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 柯庫布里 1850 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 柯庫布里 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 柯金蒂洛赫 1859 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 克里默爾 1861 (NLS)"
 
+msgid ""
+"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Lanark 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 拉奈克 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Linlithgow 1856 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 林利斯哥 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 梅博爾 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 蒙羅斯 1861-1862 (NLS)"
 
+msgid ""
+"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1853 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 馬瑟爾堡 1853 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Musselburgh 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 馬瑟爾堡 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 奈恩 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Oban 1867-1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 奧本 1867-1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Paisley 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 佩斯利 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peebles 1856 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 皮布爾斯 1856 (NLS)"
 
+msgid ""
+"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Perth 1860 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 伯斯 1860 (NLS)"
 
+msgid ""
+"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Peterhead 1868 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 彼得黑德 1868 (NLS)"
 
+msgid ""
+"Detailed town plan of Peterhead 1868, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥港 1856-1857 (NLS)"
 
+msgid ""
+"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
+"of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 波托貝羅 1893-1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 羅撒西 1862-1863 (NLS)"
 
+msgid ""
+"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Selkirk 1865 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 塞爾扣克 1865 (NLS)"
 
+msgid ""
+"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1854 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 聖安德魯斯 1854 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1854, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, St Andrews 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 聖安德魯斯 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of St Andrews 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stirling 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 史特靈 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Stirling 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stonehaven 1864 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 斯通黑文 18647 (NLS)"
 
+msgid ""
+"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1847 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1847 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1847, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1863-1877 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Stranraer 1893 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1893 (NLS)"
 
+msgid ""
+"Detailed town plan of Stranraer 1893, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Strathaven 1858 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 史垂文鎮 1858 (NLS)"
 
+msgid ""
+"Detailed town plan of Strathaven 1858, courtesy of National Library of "
+"Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wick 1872 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 維克 1872 (NLS)"
 
+msgid ""
+"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1848 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 維格鎮 1848 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "OS Town Plans, Wigtown 1894 (NLS)"
 msgstr "英國地形測量局鄉鎮規劃 - 維格鎮 1894 (NLS)"
 
+msgid ""
+"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
+msgstr ""
+
 msgid "Landsat 233055"
 msgstr "Landsat 233055"
 
+msgid "Recent Landsat imagery"
+msgstr ""
+
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
 "option to automatically generate individual house number nodes from a Way."
@@ -23100,6 +23741,9 @@ msgstr "海產"
 msgid "Dairy"
 msgstr "乳製品"
 
+msgid "Cheese"
+msgstr ""
+
 msgid "Deli (Fine Food)"
 msgstr "高級食品"
 
@@ -25345,6 +25989,9 @@ msgstr ""
 msgid "unusual value of {0}"
 msgstr ""
 
+msgid "{0} must be a numeric value, in meters and without units"
+msgstr ""
+
 msgid "relation without type"
 msgstr "關聯沒有類型 (type)"
 
@@ -26316,6 +26963,9 @@ msgstr ""
 msgid "Import"
 msgstr "匯入"
 
+msgid "Could not import a geotagged image to the Mapillary layer!"
+msgstr ""
+
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
 msgstr ""
@@ -27197,6 +27847,29 @@ msgstr "除錯"
 msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
+msgid "Please choose the address type"
+msgstr ""
+
+msgid ""
+"<html>We could not automatically determine whether <strong>{0}</strong> "
+"(part of the address {0} {1}, {2} {3}) is a <strong>street</strong> or a "
+"<strong>place</strong> name. If <strong>{0}</strong> is an actual street, "
+"please choose \"street\" below. If, however, <strong>{0}</strong> is the "
+"name of a village, hamlet, territorial zone or any object other than a "
+"street, please choose \"place\".</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>street</strong>.</html>"
+msgstr ""
+
+msgid "<html>{0} is a <strong>place</strong>.</html>"
+msgstr ""
+
+msgid ""
+"<html>Remember my choice for <strong>{0}</strong> in {1} {2} for this "
+"session.</html>"
+msgstr ""
+
 msgid "Fetch Address"
 msgstr ""
 
@@ -27206,6 +27879,9 @@ msgstr ""
 msgid "Austria Address Helper"
 msgstr ""
 
+msgid "No address type selected. Aborting."
+msgstr ""
+
 msgid "Successfully added address to selected object:"
 msgstr ""
 
@@ -31787,24 +32463,6 @@ msgstr "路標 {0}"
 msgid "Additional sign {0}"
 msgstr "額外路標 {0}"
 
-msgid "Edit relation"
-msgstr "編輯關聯"
-
-msgid "Edit relations"
-msgstr "編輯關聯"
-
-msgid "No relation is selected"
-msgstr "尚未選取關聯"
-
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關聯「{2}」移除位置 {1} 的節點「{0}」"
-
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關聯「{2}」移除位置 {1} 的路徑「{0}」"
-
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關聯「{2}」移除位置 {1} 的關聯「{0}」"
-
 msgid "routing active route"
 msgstr ""
 
diff --git a/images/presets/shop/groceries/cheese.svg b/images/presets/shop/groceries/cheese.svg
new file mode 100644
index 0000000..1c2993c
--- /dev/null
+++ b/images/presets/shop/groceries/cheese.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:docname="nicubunu-Cheese.svg"
+   viewBox="0 0 139.18741 104.05425"
+   sodipodi:version="0.32"
+   version="1.1"
+   inkscape:version="0.92.0 r15299"
+   width="139.18741"
+   height="104.05424">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient1590">
+      <stop
+         id="stop1591"
+         style="stop-color:#ff5c00;stop-opacity:.42697"
+         offset="0" />
+      <stop
+         id="stop1592"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1577">
+      <stop
+         id="stop1578"
+         style="stop-color:#ffffff;stop-opacity:.50196"
+         offset="0" />
+      <stop
+         id="stop1579"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1580"
+       y2="94.505997"
+       xlink:href="#linearGradient1577"
+       gradientUnits="userSpaceOnUse"
+       x2="58.388"
+       gradientTransform="matrix(1.1022,0,0,0.9073,-11.773229,-19.753265)"
+       y1="65.075996"
+       x1="34.276001"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1583"
+       y2="51.272999"
+       xlink:href="#linearGradient1577"
+       gradientUnits="userSpaceOnUse"
+       x2="72.248001"
+       gradientTransform="matrix(1.3191,0,0,0.75807,-11.773229,-19.753265)"
+       y1="24.069"
+       x1="59.953999"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1585"
+       y2="86.339996"
+       xlink:href="#linearGradient1577"
+       gradientUnits="userSpaceOnUse"
+       x2="86.157997"
+       gradientTransform="matrix(0.83455,0,0,1.1982,-11.773229,-19.753265)"
+       y1="77.419998"
+       x1="75.865997"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1587"
+       y2="49.897999"
+       xlink:href="#linearGradient1577"
+       gradientUnits="userSpaceOnUse"
+       x2="32.846001"
+       gradientTransform="matrix(0.63314,0,0,1.5794,-11.773229,-19.753265)"
+       y1="41.249001"
+       x1="17.386"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1595"
+       y2="63.919998"
+       xlink:href="#linearGradient1590"
+       gradientUnits="userSpaceOnUse"
+       x2="65.230003"
+       gradientTransform="matrix(1.2881,0,0,0.77634,-11.773229,-19.753265)"
+       y1="99.250999"
+       x1="106.48"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient1597"
+       y2="100.47"
+       xlink:href="#linearGradient1590"
+       gradientUnits="userSpaceOnUse"
+       x2="72.963997"
+       gradientTransform="matrix(1.1674,0,0,0.8566,-11.773229,-19.753265)"
+       y1="123.48"
+       x1="128.81"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:guide-bbox="true"
+     pagecolor="#ffffff"
+     inkscape:window-height="987"
+     inkscape:window-maximized="1"
+     inkscape:zoom="1"
+     inkscape:window-x="-8"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="svg1"
+     inkscape:cx="102.02517"
+     inkscape:cy="-75.232187"
+     inkscape:window-y="-8"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     showguides="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="m 65.795771,0.72673504 c -10.137,0.16 -20.99,1.74499996 -32.158,5.48999996 -7.596,1.582 -29.971,17.339 -30.153,34.091 -0.059,-0.589 -0.207,-1.133 -0.219,-1.745 -2.93899999,5.202 -2.72199999,19.36 -2.47899999,25.664 0.137,1.396 0.71099999,3.023 1.38599999,4.682 0.362,4.555 2.548,9.159 7.109,13.538 0.013,0.01 0.024,0.03 0.037,0.04 1.218,1.52 2.539,2.87 3.938,3.66 1.151,-1.65 20.91,-10.938 36.715,-17.834 0.138,0.203 0.285,0.402 0.438,0.596 0.782,8.349 -2.659,20.188 -2.042,24.978 -0. [...]
+     style="fill:#ffff00;fill-rule:evenodd"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path1559" />
+  <path
+     d="m 14.614771,84.246735 c 0,0 1.076,-22.974 1.256,-24.769 0.179,-1.795 60.845,-27.82 63.178,-28.358 1.167,-0.27 -7.538,16.826 -8.929,24.365 -16.109,11.846 -53.082,26.162 -55.505,28.762 z"
+     style="fill:url(#linearGradient1580);fill-rule:evenodd"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path1576" />
+  <path
+     d="m 14.873771,59.466735 c -29.697,-21.507 8.798,-50.573 19.227,-52.744 44.671,-14.981 84.055999,4.633 94.215999,12.523 8.48,9.481 11.07,33.013 -1.78,44.112 -13.63,11.142 -67.988999,21.399 -76.799999,4.728 5.874,-7.744 25.631,-33.194 32.488,-39.327 -13.997,6.364 -58.31,24.784 -67.351,30.708 z"
+     style="fill:#ffd900;fill-rule:evenodd"
+     sodipodi:nodetypes="ccccccc"
+     inkscape:connector-curvature="0"
+     id="path908" />
+  <path
+     d="m 14.874771,59.470735 c -29.696,-21.507 8.798,-50.573 19.227,-52.744 44.67,-14.982 84.054999,4.632 94.214999,12.523 8.47,9.481 11.07,33.012 -1.78,44.111 -13.63,11.142 -67.988999,21.406 -76.799999,4.729 5.875,-7.744 25.631,-33.194 32.488,-39.328 -13.997,6.364 -58.308,24.784 -67.35,30.709 z"
+     style="fill:url(#linearGradient1583);fill-rule:evenodd"
+     sodipodi:nodetypes="ccccccc"
+     inkscape:connector-curvature="0"
+     id="path1582" />
+  <path
+     d="m 14.901771,59.298735 c -29.696,-21.507 8.798,-50.573 19.227,-52.744 44.67,-14.982 84.047999,4.632 94.217999,12.523 9.1,10.106 9.82,31.762 -3.03,42.861 -28.629999,20.828 -65.803999,24.838 -75.239999,6.604 5.875,-7.744 25.318,-33.819 32.175,-39.952 -13.997,6.363 -58.308,24.783 -67.35,30.708 z"
+     style="fill:url(#linearGradient1595);fill-rule:evenodd"
+     sodipodi:nodetypes="ccccccc"
+     inkscape:connector-curvature="0"
+     id="path1588" />
+  <path
+     d="m 50.722771,68.790735 c 1.099,9.532 -3.771,24.086 -1.508,27.076 10.194,9.260005 26.728,7.730005 38.289,6.010005 13.462999,-2.030005 21.282999,-4.910005 32.862999,-10.210005 9.56,-5.91 12.05,-11.09 15.93,-24.03 2.87,-5.172 4.2,-15.036 -0.29,-30.736 -1.9,13.686 -3.97,15.92 -9.13,24.279 -9.7,7.901 -25.75,14.25 -38.681999,15.427 -12.133,0.593 -25.077,0.899 -37.472,-7.816 z"
+     style="fill:#ffc600;fill-rule:evenodd"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     id="path1550" />
+  <path
+     d="m 14.354771,64.363735 c 0.011,4.952 0.886,6.729 0.026,11.602 -0.548,3.242 0.027,5.681 -1.206,9.011 -2.826,-1.6 -3.69,-2.68 -5.716,-5.697 -4.804,-5.43 -3.642,-8.193 -5.852,-13.247 -0.242,-6.304 -1.18199999,-20.464 1.758,-25.665 0.235,12.762 11.046,19.543 11.282,19.674 z"
+     style="fill:#ffc600;fill-rule:evenodd"
+     sodipodi:nodetypes="cccccccc"
+     inkscape:connector-curvature="0"
+     id="path1551" />
+  <path
+     d="m 50.733771,69.314735 c 1.099,9.532 -3.771,24.082 -1.508,27.072 10.194,9.260005 26.728,7.730005 38.29,6.020005 13.460999,-2.03 21.280999,-4.920005 32.870999,-10.210005 9.55,-5.92 12.04,-11.1 15.92,-24.035 2.87,-5.173 4.2,-15.037 -0.29,-30.737 -1.9,13.686 -3.97,15.92 -9.13,24.28 -9.7,7.9 -25.74,14.249 -38.679999,15.426 -12.134,0.594 -25.078,0.899 -37.473,-7.816 z"
+     style="fill:url(#linearGradient1597);fill-rule:evenodd"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     id="path1596" />
+  <path
+     d="m 3.501771,38.277735 c -0.672,4.442 3.293,19.378 11.575,20.945 15.221,-8.622 67.289,-30.228 67.289,-30.228 l -32.37,39.113 c 0.672,6.532 25.295,9.145 34.696,8.884 8.505,-0.523 54.754999,-5.405 50.724999,-43.555"
+     style="fill:none;stroke:#000000;stroke-width:1.25"
+     sodipodi:nodetypes="cccccc"
+     inkscape:connector-curvature="0"
+     id="path1574" />
+  <path
+     d="m 15.099771,58.903735 c 0,0 -0.363,26.103 -1.818,26.743"
+     style="fill:none;stroke:#000000;stroke-width:1.25"
+     sodipodi:nodetypes="cc"
+     inkscape:connector-curvature="0"
+     id="path1575" />
+  <path
+     d="m 50.937771,70.802735 c 0.385,3.847 -2.693,19.814 -2.308,23.664 3.655,3.07 20.198,-18.855 15.966,-18.47 -4.232,-1.155 -9.618,-1.924 -13.658,-5.194 z"
+     style="fill:url(#linearGradient1585);fill-rule:evenodd"
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path1584" />
+  <path
+     d="m 2.846771,41.754735 c -1.154,3.463 -2.30899999,14.236 -1.347,23.854 3.463,5.386 9.041,-5.194 9.811,-6.925 -0.962,-1.732 -5.771,-3.848 -8.464,-16.929 z"
+     style="fill:url(#linearGradient1587);fill-rule:evenodd"
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path1586" />
+  <path
+     d="m 65.739771,0.63873504 c -10.137,0.16 -20.988,1.75399996 -32.156,5.49999996 -7.205,1.5 -27.471,15.772 -29.719,31.531 0,0 -0.554,1.214 -0.56,0.909 -2.93899999,5.201 -2.80699999,19.255 -2.56499999,25.56 0.137,1.395 0.70099999,3.028 1.37499999,4.687 0.363,4.555 2.949,9.06 7.125,13.531 0.013,0.01 2.763,2.64 4.162,3.43 1.149,-1.65 20.669,-10.63 36.463,-17.523 1.675,5.841 -2.144,20.763 -1.531,25.533 0.602,3.55 3.389,4.49 4.406,5.09 2.441,1.490005 12.592,4.450005 18.969,4.530005 1.803,0 [...]
+     style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linejoin:round"
+     sodipodi:nodetypes="ccccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path1598" />
+  <metadata
+     id="metadata32">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 296bc3d..b6e605b 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -30,13 +30,14 @@ dist.dir=dist
 dist.jar=${dist.dir}/josm.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=org/apache/commons/compress/compressors/lz4/**,org/apache/commons/compress/compressors/lz77support/**,org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/co [...]
+excludes=org/apache/commons/compress/compressors/brotli/**,org/apache/commons/compress/compressors/lz4/**,org/apache/commons/compress/compressors/lz77support/**,org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/com [...]
 file.reference.commons-collections-3.2.2.jar=../test/lib/unitils-core/commons-collections-3.2.2.jar
 file.reference.commons-lang-2.6.jar=../test/lib/unitils-core/commons-lang-2.6.jar
 file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-logging-1.1.3.jar
+file.reference.commons-testing-2.1.0.jar=../test/lib/commons-testing/commons-testing-2.1.0.jar
 file.reference.core-src=../src
 file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
-file.reference.equalsverifier-2.2.1.jar=../test/lib/equalsverifier-2.2.1.jar
+file.reference.equalsverifier-2.3.jar=../test/lib/equalsverifier-2.3.jar
 file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
 file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
 file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
@@ -71,7 +72,7 @@ javac.test.classpath=\
     ${build.classes.dir}:\
     ${file.reference.junit-4.12.jar}:\
     ${file.reference.jfcunit.jar}:\
-    ${file.reference.equalsverifier-2.2.1.jar}:\
+    ${file.reference.equalsverifier-2.3.jar}:\
     ${file.reference.hamcrest-core-1.3.jar}:\
     ${file.reference.MRJToolkitStubs-1.0.jar}:\
     ${file.reference.debug-1.0.jar}:\
@@ -89,7 +90,8 @@ javac.test.classpath=\
     ${file.reference.ognl-2.6.9.jar}:\
     ${file.reference.unitils-core-3.4.6.jar}:\
     ${file.reference.system-rules-1.16.1.jar}:\
-    ${file.reference.findbugs.jar}
+    ${file.reference.findbugs.jar}:\
+    ${file.reference.commons-testing-2.1.0.jar}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
diff --git a/scripts/SyncEditorLayerIndex.groovy b/scripts/SyncEditorLayerIndex.groovy
index a19e169..e9d47f0 100644
--- a/scripts/SyncEditorLayerIndex.groovy
+++ b/scripts/SyncEditorLayerIndex.groovy
@@ -38,8 +38,8 @@ class SyncEditorLayerIndex {
     static String eliInputFile = 'imagery_eli.geojson'
     static String josmInputFile = 'imagery_josm.imagery.xml'
     static String ignoreInputFile = 'imagery_josm.ignores.txt'
-    static FileWriter outputFile = null
-    static BufferedWriter outputStream = null
+    static FileOutputStream outputFile = null
+    static OutputStreamWriter outputStream = null
     def skip = [:]
 
     static def options
@@ -55,15 +55,19 @@ class SyncEditorLayerIndex {
         script.start()
         script.loadJosmEntries()
         if(options.josmxml) {
-            def file = new FileWriter(options.josmxml)
-            def stream = new BufferedWriter(file)
+            def file = new FileOutputStream(options.josmxml)
+            def stream = new OutputStreamWriter(file, "UTF-8")
             script.printentries(script.josmEntries, stream)
+            stream.close();
+            file.close();
         }
         script.loadELIEntries()
         if(options.elixml) {
-            def file = new FileWriter(options.elixml)
-            def stream = new BufferedWriter(file)
+            def file = new FileOutputStream(options.elixml)
+            def stream = new OutputStreamWriter(file, "UTF-8")
             script.printentries(script.eliEntries, stream)
+            stream.close();
+            file.close();
         }
         script.checkInOneButNotTheOther()
         script.checkCommonEntries()
@@ -109,13 +113,13 @@ class SyncEditorLayerIndex {
             ignoreInputFile = options.ignore_input
         }
         if (options.output && options.output != "-") {
-            outputFile = new FileWriter(options.output)
-            outputStream = new BufferedWriter(outputFile)
+            outputFile = new FileOutputStream(options.output)
+            outputStream = new OutputStreamWriter(outputFile, "UTF-8")
         }
     }
 
     void loadSkip() {
-        FileReader fr = new FileReader(ignoreInputFile)
+        def fr = new InputStreamReader(new FileInputStream(ignoreInputFile), "UTF-8")
         def line
 
         while((line = fr.readLine()) != null) {
@@ -133,8 +137,7 @@ class SyncEditorLayerIndex {
 
     void myprintlnfinal(String s) {
         if(outputStream != null) {
-            outputStream.write(s)
-            outputStream.newLine()
+            outputStream.write(s+System.getProperty("line.separator"))
         } else {
             println s
         }
@@ -151,10 +154,10 @@ class SyncEditorLayerIndex {
                 return
             }
         } else if(options.xhtmlbody || options.xhtml) {
-            String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" : "red")
+            String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" :  (s.startsWith("#") ? "indigo" : "red"))
             s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
         }
-        if ((s.startsWith("+ ") || s.startsWith("+++ ELI")) && options.noeli) {
+        if ((s.startsWith("+ ") || s.startsWith("+++ ELI") || s.startsWith("#")) && options.noeli) {
             return
         }
         myprintlnfinal(s)
@@ -183,7 +186,7 @@ class SyncEditorLayerIndex {
         jr.close()
 
         for (def e : eliEntries) {
-            def url = getUrl(e)
+            def url = getUrlStripped(e)
             if (url.contains("{z}")) {
                 myprintln "+++ ELI-URL uses {z} instead of {zoom}: "+url
                 url = url.replace("{z}","{zoom}")
@@ -224,7 +227,7 @@ class SyncEditorLayerIndex {
         }
         return res
     }
-    
+
     void printentries(def entries, def stream) {
         DecimalFormat df = new DecimalFormat("#.#######")
         df.setRoundingMode(java.math.RoundingMode.CEILING)
@@ -240,11 +243,17 @@ class SyncEditorLayerIndex {
                 stream.write "        <date>$t</date>\n"
             if((t = getCountryCode(e)))
                 stream.write "        <country-code>$t</country-code>\n"
+            if((getDefault(e)))
+                stream.write "        <default>true</default>\n"
             stream.write maininfo(e, "        ")
             if((t = getAttributionText(e)))
                 stream.write "        <attribution-text mandatory=\"true\">${cdata(t, true)}</attribution-text>\n"
             if((t = getAttributionUrl(e)))
                 stream.write "        <attribution-url>${cdata(t)}</attribution-url>\n"
+            if((t = getLogoImage(e)))
+                stream.write "        <logo-image>${cdata(t, true)}</logo-image>\n"
+            if((t = getLogoUrl(e)))
+                stream.write "        <logo-url>${cdata(t)}</logo-url>\n"
             if((t = getTermsOfUseText(e)))
                 stream.write "        <terms-of-use-text>${cdata(t, true)}</terms-of-use-text>\n"
             if((t = getTermsOfUseUrl(e)))
@@ -299,7 +308,7 @@ class SyncEditorLayerIndex {
         josmEntries = reader.parse()
 
         for (def e : josmEntries) {
-            def url = getUrl(e)
+            def url = getUrlStripped(e)
             if (url.contains("{z}")) {
                 myprintln "+++ JOSM-URL uses {z} instead of {zoom}: "+url
                 url = url.replace("{z}","{zoom}")
@@ -310,7 +319,7 @@ class SyncEditorLayerIndex {
                 josmUrls.put(url, e)
             }
             for (def m : e.getMirrors()) {
-                url = getUrl(m)
+                url = getUrlStripped(m)
                 m.origName = m.getOriginalName().replaceAll(" mirror server( \\d+)?","")
                 if (josmUrls.containsKey(url)) {
                     myprintln "+++ JOSM-Mirror-URL is not unique: "+url
@@ -358,10 +367,22 @@ class SyncEditorLayerIndex {
             def e = eliUrls.get(url)
             if (!josmUrls.containsKey(url)) continue
             def j = josmUrls.get(url)
-            def ename = getName(e).replace("'","’")
-            def jname = getName(j).replace("'","’")
+            def ename = getName(e).replace("'","\u2019")
+            def jname = getName(j).replace("'","\u2019")
             if (!ename.equals(jname)) {
-                myprintln "* Name differs ('${getName(e)}' != '${getName(j)}'): $url"
+                myprintln "* Name differs ('${getName(e)}' != '${getName(j)}'): ${getUrl(j)}"
+            }
+        }
+
+        myprintln "*** Same URL, but different Id: ***"
+        for (def url : eliUrls.keySet()) {
+            def e = eliUrls.get(url)
+            if (!josmUrls.containsKey(url)) continue
+            def j = josmUrls.get(url)
+            def ename = getId(e)
+            def jname = getId(j)
+            if (!ename.equals(jname)) {
+                myprintln "# Id differs ('${getId(e)}' != '${getId(j)}'): ${getUrl(j)}"
             }
         }
 
@@ -371,7 +392,7 @@ class SyncEditorLayerIndex {
             if (!josmUrls.containsKey(url)) continue
             def j = josmUrls.get(url)
             if (!getType(e).equals(getType(j))) {
-                myprintln "* Type differs (${getType(e)} != ${getType(j)}): ${getName(j)} - $url"
+                myprintln "* Type differs (${getType(e)} != ${getType(j)}): ${getName(j)} - ${getUrl(j)}"
             }
         }
 
@@ -447,7 +468,7 @@ class SyncEditorLayerIndex {
                 if (jd.isEmpty()) {
                     myprintln "- Missing JOSM date (${t}): ${getDescription(j)}"
                 } else if (!ed.isEmpty()) {
-                    myprintln "* Date differs (${t} != '${jd}'): ${getDescription(j)}"
+                    myprintln "* Date differs ('${t}' != '${jd}'): ${getDescription(j)}"
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI date ('${jd}'): ${getDescription(j)}"
                 }
@@ -463,12 +484,11 @@ class SyncEditorLayerIndex {
             def jt = getDescriptions(j)
             et = (et.size() > 0) ? et["en"] : ""
             jt = (jt.size() > 0) ? jt["en"] : ""
-            def et2 = et.replaceAll("channels (\\d+) ", "\$1 channels ") // imagico entries
-            if (!et.equals(jt) && !(et && jt && (et.endsWith(jt) || et2.endsWith(jt)))) {
+            if (!et.equals(jt)) {
                 if (!jt) {
-                    myprintln "+ SKIP - Missing JOSM description (${et}): ${getDescription(j)}"
+                    myprintln "- Missing JOSM description (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "+ SKIP * Description differs (${et} != '${jt}'): ${getDescription(j)}"
+                    myprintln "* Description differs ('${et}' != '${jt}'): ${getDescription(j)}"
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI description ('${jt}'): ${getDescription(j)}"
                 }
@@ -479,9 +499,9 @@ class SyncEditorLayerIndex {
             if (!jt) jt = getTermsOfUseUrl(j)
             if (!et.equals(jt)) {
                 if (!jt) {
-                    myprintln "+ SKIP - Missing JOSM license URL (${et}): ${getDescription(j)}"
+                    myprintln "- Missing JOSM license URL (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "+ SKIP * License URL differs (${et} != '${jt}'): ${getDescription(j)}"
+                    myprintln "* License URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI license URL ('${jt}'): ${getDescription(j)}"
                 }
@@ -491,9 +511,9 @@ class SyncEditorLayerIndex {
             jt = getAttributionUrl(j)
             if (!et.equals(jt)) {
                 if (!jt) {
-                    myprintln "+ SKIP - Missing JOSM attribution URL (${et}): ${getDescription(j)}"
+                    myprintln "- Missing JOSM attribution URL (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "+ SKIP * Attribution URL differs (${et} != '${jt}'): ${getDescription(j)}"
+                    myprintln "* Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI attribution URL ('${jt}'): ${getDescription(j)}"
                 }
@@ -503,9 +523,9 @@ class SyncEditorLayerIndex {
             jt = getAttributionText(j)
             if (!et.equals(jt)) {
                 if (!jt) {
-                    myprintln "+ SKIP - Missing JOSM attribution text (${et}): ${getDescription(j)}"
+                    myprintln "- Missing JOSM attribution text (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "+ SKIP * Attribution text differs (${et} != '${jt}'): ${getDescription(j)}"
+                    myprintln "* Attribution text differs ('${et}' != '${jt}'): ${getDescription(j)}"
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI attribution text ('${jt}'): ${getDescription(j)}"
                 }
@@ -517,13 +537,23 @@ class SyncEditorLayerIndex {
             if (jt) { jt = new LinkedList(jt); Collections.sort(jt); jt = String.join(" ", jt) }
             if (!et.equals(jt)) {
                 if (!jt) {
-                    myprintln "+ SKIP - Missing JOSM projections (${et}): ${getDescription(j)}"
+                    myprintln "- Missing JOSM projections (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "+ SKIP * Projections differ (${et} != '${jt}'): ${getDescription(j)}"
-                } else if (!options.nomissingeli) {
+                    myprintln "* Projections differ ('${et}' != '${jt}'): ${getDescription(j)}"
+                } else if (!options.nomissingeli && !getType(e).equals("tms")) {
                     myprintln "+ Missing ELI projections ('${jt}'): ${getDescription(j)}"
                 }
             }
+
+            et = getDefault(e)
+            jt = getDefault(j)
+            if (!et.equals(jt)) {
+                if (!jt) {
+                    myprintln "- Missing JOSM default: ${getDescription(j)}"
+                } else if (!options.nomissingeli) {
+                    myprintln "+ Missing ELI default: ${getDescription(j)}"
+                }
+            }
         }
         myprintln "*** Mismatching shapes: ***"
         for (def url : josmUrls.keySet()) {
@@ -646,6 +676,15 @@ class SyncEditorLayerIndex {
                     }
                 }
             }
+            if(getAttributionUrl(j) && !getAttributionText(j)) {
+                myprintln "* Attribution link without text: ${getDescription(j)}"
+            }
+            if(getLogoUrl(j) && !getLogoImage(j)) {
+                myprintln "* Logo link without image: ${getDescription(j)}"
+            }
+            if(getTermsOfUseText(j) && !getTermsOfUseUrl(j)) {
+                myprintln "* Terms of Use text without link: ${getDescription(j)}"
+            }
             def js = getShapes(j)
             if(js.size()) {
                 def minlat = 1000
@@ -677,6 +716,9 @@ class SyncEditorLayerIndex {
         if (e instanceof ImageryInfo) return e.url
         return e.get("properties").getString("url")
     }
+    static String getUrlStripped(Object e) {
+        return getUrl(e).replaceAll("\\?(apikey|access_token)=.*","")
+    }
     static String getDate(Object e) {
         if (e instanceof ImageryInfo) return e.date ? e.date : ""
         def p = e.get("properties")
@@ -811,6 +853,14 @@ class SyncEditorLayerIndex {
         if (e instanceof ImageryInfo) return e.getTermsOfUseURL()
         return null
     }
+    static String getLogoImage(Object e) {
+        if (e instanceof ImageryInfo) return e.getAttributionImageRaw()
+        return null
+    }
+    static String getLogoUrl(Object e) {
+        if (e instanceof ImageryInfo) return e.getAttributionImageURL()
+        return null
+    }
     static String getPermissionReferenceUrl(Object e) {
         if (e instanceof ImageryInfo) return e.getPermissionReferenceURL()
         return e.get("properties").getString("license_url", null)
@@ -830,6 +880,10 @@ class SyncEditorLayerIndex {
         if (e instanceof ImageryInfo) return e.isGeoreferenceValid()
         return false
     }
+    static Boolean getDefault(Object e) {
+        if (e instanceof ImageryInfo) return e.isDefaultEntry()
+        return e.get("properties").getBoolean("default", false)
+    }
     String getDescription(Object o) {
         def url = getUrl(o)
         def cc = getCountryCode(o)
diff --git a/scripts/since_xxx.py b/scripts/since_xxx.py
new file mode 100755
index 0000000..8606a36
--- /dev/null
+++ b/scripts/since_xxx.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# License: CC0
+
+"""
+Helper script to replace "@since xxx" in Javadoc by the upcoming revision number.
+
+Will retrieve the current revision number from the server. It runs over all
+modified and added .java files and replaces xxx in "@since xxx" by the revision
+number that is to be expected for the next commit.
+"""
+
+import xml.etree.ElementTree as ElementTree
+import subprocess
+
+svn_info_local = subprocess.check_output("svn info --xml".split(" "))
+rep_url = ElementTree.fromstring(svn_info_local).findtext("./entry/repository/root")
+svn_info_server = subprocess.check_output("svn info --xml".split(" ") + [rep_url])
+rev = int(ElementTree.fromstring(svn_info_server).find("./entry").get("revision")) + 1
+svn_status = subprocess.check_output("svn status --xml".split(" "))
+for el in ElementTree.fromstring(svn_status).findall("./target/entry"):
+    if  el.find('wc-status').get("item") not in ["added", "modified"]:
+        continue
+    path = el.get("path")
+    if not path.endswith('.java'):
+        continue
+    with open(path, 'r') as f:
+        filedata = f.read()
+    filedata2 = filedata.replace("@since xxx", "@since {}".format(rev))
+    if filedata != filedata2:
+        print("replacing '@since xxx' with '@since {}' in '{}'".format(rev, path))
+        with open(path, 'w') as f:
+            f.write(filedata2)
+    
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 4d0e308..664f991 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -37,7 +37,6 @@ import javax.swing.Action;
 import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -64,7 +63,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.validation.OsmValidator;
-import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MainPanel;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -197,6 +195,22 @@ public abstract class Main {
     public MainMenu menu;
 
     /**
+     * The main panel.
+     * @since 12125
+     */
+    public MainPanel panel;
+
+    /**
+     * The same main panel, required to be static for {@code MapFrameListener} handling.
+     */
+    protected static MainPanel mainPanel;
+
+    /**
+     * The private content pane of {@code MainFrame}, required to be static for shortcut handling.
+     */
+    protected static JComponent contentPanePrivate;
+
+    /**
      * The file watcher service.
      */
     public static final FileWatcher fileWatcher = new FileWatcher();
@@ -214,12 +228,6 @@ public abstract class Main {
     public static int logLevel = 3;
 
     /**
-     * The real main panel. This field may be removed any time and made private to {@link MainFrame}
-     * @see #panel
-     */
-    protected static final MainPanel mainPanel = new MainPanel(getLayerManager());
-
-    /**
      * Replies the first lines of last 5 error and warning messages, used for bug reports
      * @return the first lines of last 5 error and warning messages
      * @since 7420
@@ -490,7 +498,6 @@ public abstract class Main {
      */
     protected Main() {
         setInstance(this);
-        mainPanel.addMapFrameListener((o, n) -> redoUndoListener.commandChanged(0, 0));
     }
 
     private static void setInstance(Main instance) {
@@ -578,7 +585,7 @@ public abstract class Main {
 
     /**
      * Called once at startup to initialize the main window content.
-     * Should set {@link #menu}
+     * Should set {@link #menu} and {@link #panel}
      */
     protected abstract void initializeMainWindow();
 
@@ -634,8 +641,6 @@ public abstract class Main {
         }
     }
 
-    protected static final JPanel contentPanePrivate = new JPanel(new BorderLayout());
-
     public static void redirectToMainContentPane(JComponent source) {
         RedirectInputMap.redirect(source, contentPanePrivate);
     }
@@ -715,11 +720,9 @@ public abstract class Main {
     ///////////////////////////////////////////////////////////////////////////
 
     /**
-     * Global panel.
+     * Listener that sets the enabled state of undo/redo menu entries.
      */
-    public static final JPanel panel = mainPanel;
-
-    private final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
+    protected final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
             menu.undo.setEnabled(queueSize > 0);
             menu.redo.setEnabled(redoSize > 0);
         };
@@ -768,8 +771,6 @@ public abstract class Main {
             error(e);
         }
         toolbar = new ToolbarPreferences();
-        contentPanePrivate.updateUI();
-        panel.updateUI();
 
         UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
         UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon"));
@@ -1077,10 +1078,6 @@ public abstract class Main {
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
         if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            if (Main.map != null) {
-                // This needs to be called first
-                Main.map.mapView.fixProjection();
-            }
             synchronized (Main.class) {
                 Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
                 while (it.hasNext()) {
@@ -1102,6 +1099,7 @@ public abstract class Main {
 
     /**
      * Register a projection change listener.
+     * The listener is registered to be weak, so keep a reference of it if you want it to be preserved.
      *
      * @param listener the listener. Ignored if <code>null</code>.
      */
diff --git a/src/org/openstreetmap/josm/actions/AddNodeAction.java b/src/org/openstreetmap/josm/actions/AddNodeAction.java
index 5cc050f..1345bcf 100644
--- a/src/org/openstreetmap/josm/actions/AddNodeAction.java
+++ b/src/org/openstreetmap/josm/actions/AddNodeAction.java
@@ -65,12 +65,8 @@ public final class AddNodeAction extends JosmAction {
         // add the node
         Main.main.undoRedo.add(new AddCommand(nnew));
         getLayerManager().getEditDataSet().setSelected(nnew);
-        if (Main.map.mapView != null) {
-            if (Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
-                Main.map.mapView.repaint();
-            } else {
-                AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
-            }
+        if (Main.map.mapView != null && !Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
+            AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
         }
     }
 
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index 98086fe..ec56c0f 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -223,10 +223,14 @@ public class AutoScaleAction extends JosmAction {
         if (Main.getLayerManager().getActiveLayer() == null) {
             return null;
         }
-        List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
-        if (layers.isEmpty())
-            return null;
-        return layers.get(0);
+        try {
+            List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
+            if (!layers.isEmpty())
+                return layers.get(0);
+        } catch (IllegalStateException e) {
+            Main.error(e);
+        }
+        return null;
     }
 
     private BoundingXYVisitor getBoundingBox() {
diff --git a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
index a2b898b..8559387 100644
--- a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
@@ -30,9 +30,9 @@ public class CopyCoordinatesAction extends JosmAction {
     public void actionPerformed(ActionEvent ae) {
         StringBuilder s = new StringBuilder();
         for (Node n : getSelectedNodes()) {
-            s.append(n.getCoor().lat());
+            s.append(n.lat());
             s.append(", ");
-            s.append(n.getCoor().lon());
+            s.append(n.lon());
             s.append('\n');
         }
         ClipboardUtils.copyString(s.toString().trim());
diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
index 366f8e6..1bf9bbb 100644
--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
@@ -31,6 +31,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
@@ -400,7 +401,7 @@ public class CreateMultipolygonAction extends JosmAction {
         if ("coastline".equals(values.get("natural")))
             values.remove("natural");
 
-        values.put("area", "yes");
+        values.put("area", OsmUtils.TRUE_VALUE);
 
         List<Command> commands = new ArrayList<>();
         boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
index 36ff632..275e3a0 100644
--- a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -18,6 +18,9 @@ import org.openstreetmap.josm.tools.Shortcut;
 */
 public class DialogsToggleAction extends ToggleAction {
 
+    private boolean toolbarPreviouslyVisible;
+    private boolean sideToolbarPreviouslyVisible;
+
     /**
      * Constructs a new {@code DialogsToggleAction}.
      */
@@ -45,14 +48,18 @@ public class DialogsToggleAction extends ToggleAction {
     protected void setMode() {
         if (Main.isDisplayingMapView()) {
             boolean selected = isSelected();
+            if (!selected) {
+                toolbarPreviouslyVisible = Main.pref.getBoolean("toolbar.visible", true);
+                sideToolbarPreviouslyVisible = Main.pref.getBoolean("sidetoolbar.visible", true);
+            }
             Main.map.setDialogsPanelVisible(selected);
             Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
             Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true));
             // Toolbars listen to preference changes, use it here
-            if (!Main.pref.getBoolean("toolbar.always-visible", true)) {
+            if (!Main.pref.getBoolean("toolbar.always-visible", true) && (!selected || toolbarPreviouslyVisible)) {
                 Main.pref.put("toolbar.visible", selected);
             }
-            if (!Main.pref.getBoolean("sidetoolbar.always-visible", true)) {
+            if (!Main.pref.getBoolean("sidetoolbar.always-visible", true) && (!selected || sideToolbarPreviouslyVisible)) {
                 Main.pref.put("sidetoolbar.visible", selected);
             }
             Main.map.mapView.rememberLastPositionOnScreen();
diff --git a/src/org/openstreetmap/josm/actions/FollowLineAction.java b/src/org/openstreetmap/josm/actions/FollowLineAction.java
index 32aa4f3..24d7a0d 100644
--- a/src/org/openstreetmap/josm/actions/FollowLineAction.java
+++ b/src/org/openstreetmap/josm/actions/FollowLineAction.java
@@ -120,7 +120,7 @@ public class FollowLineAction extends JosmAction {
             );
             // "viewport following" mode for tracing long features
             // from aerial imagery or GPS tracks.
-            if (Main.map.mapView.viewportFollowing) {
+            if (DrawAction.VIEWPORT_FOLLOWING.get()) {
                 Main.map.mapView.smoothScrollTo(newPoint.getEastNorth());
             }
         }
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 26d5b7a..863f324 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -25,6 +25,7 @@ import javax.swing.JPanel;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
@@ -42,7 +43,8 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
     private static volatile ImageryOffsetDialog offsetDialog;
     private static Cursor cursor = ImageProvider.getCursor("normal", "move");
 
-    private EastNorth old;
+    private OffsetBookmark old;
+    private OffsetBookmark tempOffset;
     private EastNorth prevEastNorth;
     private transient AbstractTileSourceLayer<?> layer;
     private MapMode oldMapMode;
@@ -65,7 +67,20 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
         if (!layer.isVisible()) {
             layer.setVisible(true);
         }
-        old = layer.getDisplaySettings().getDisplacement();
+        old = layer.getDisplaySettings().getOffsetBookmark();
+        EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(Main.getProjection());
+        LatLon center;
+        if (Main.isDisplayingMapView()) {
+            center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
+        } else {
+            center = LatLon.ZERO;
+        }
+        tempOffset = new OffsetBookmark(
+                Main.getProjection().toCode(),
+                layer.getInfo().getName(),
+                null,
+                curOff.east(), curOff.north(), center.lon(), center.lat());
+        layer.getDisplaySettings().setOffsetBookmark(tempOffset);
         addListeners();
         showOffsetDialog(new ImageryOffsetDialog());
     }
@@ -95,7 +110,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
         super.exitMode();
         if (offsetDialog != null) {
             if (layer != null) {
-                layer.getDisplaySettings().setDisplacement(old);
+                layer.getDisplaySettings().setOffsetBookmark(old);
             }
             hideOffsetDialog();
             // do not restore old mode here - this is called when the new mode is already known.
@@ -135,7 +150,9 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
         }
         if (dx != 0 || dy != 0) {
             double ppd = layer.getPPD();
-            layer.getDisplaySettings().addDisplacement(new EastNorth(dx / ppd, dy / ppd));
+            EastNorth d = tempOffset.getDisplacement().add(new EastNorth(dx / ppd, dy / ppd));
+            tempOffset.setDisplacement(d);
+            layer.getDisplaySettings().setOffsetBookmark(tempOffset);
             if (offsetDialog != null) {
                 offsetDialog.updateOffset();
             }
@@ -162,8 +179,9 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
     public void mouseDragged(MouseEvent e) {
         if (layer == null || prevEastNorth == null) return;
         EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
-        EastNorth d = layer.getDisplaySettings().getDisplacement().add(eastNorth).subtract(prevEastNorth);
-        layer.getDisplaySettings().setDisplacement(d);
+        EastNorth d = tempOffset.getDisplacement().add(eastNorth).subtract(prevEastNorth);
+        tempOffset.setDisplacement(d);
+        layer.getDisplaySettings().setOffsetBookmark(tempOffset);
         if (offsetDialog != null) {
             offsetDialog.updateOffset();
         }
@@ -238,7 +256,8 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
                     String northing = ostr.substring(semicolon + 1).trim().replace(',', '.');
                     double dx = Double.parseDouble(easting);
                     double dy = Double.parseDouble(northing);
-                    layer.getDisplaySettings().setDisplacement(new EastNorth(dx, dy));
+                    tempOffset.setDisplacement(new EastNorth(dx, dy));
+                    layer.getDisplaySettings().setOffsetBookmark(tempOffset);
                 } catch (NumberFormatException nfe) {
                     // we repaint offset numbers in any case
                     Main.trace(nfe);
@@ -304,7 +323,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             offsetDialog = null;
             if (layer != null) {
                 if (getValue() != 1) {
-                    layer.getDisplaySettings().setDisplacement(old);
+                    layer.getDisplaySettings().setOffsetBookmark(old);
                 } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
                     OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
                 }
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index 94ea043..d67e672 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -15,6 +15,8 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
@@ -186,7 +188,8 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
         }
         if (listenToSelectionChange()) {
             selectionChangeAdapter = new SelectionChangeAdapter();
-            DataSet.addSelectionListener(selectionChangeAdapter);
+            SelectionEventManager.getInstance()
+                .addSelectionListener(selectionChangeAdapter, FireMode.IN_EDT_CONSOLIDATED);
         }
         initEnabledState();
     }
diff --git a/src/org/openstreetmap/josm/actions/MoveAction.java b/src/org/openstreetmap/josm/actions/MoveAction.java
index 87dce48..749f606 100644
--- a/src/org/openstreetmap/josm/actions/MoveAction.java
+++ b/src/org/openstreetmap/josm/actions/MoveAction.java
@@ -136,13 +136,17 @@ public class MoveAction extends JosmAction {
         ? Main.main.undoRedo.commands.getLast() : null;
 
         ds.beginUpdate();
-        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-            ((MoveCommand) c).moveAgain(distx, disty);
-        } else {
-            c = new MoveCommand(selection, distx, disty);
-            Main.main.undoRedo.add(c);
+        try {
+            if (c instanceof MoveCommand && ds.equals(c.getAffectedDataSet())
+                    && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
+                ((MoveCommand) c).moveAgain(distx, disty);
+            } else {
+                c = new MoveCommand(selection, distx, disty);
+                Main.main.undoRedo.add(c);
+            }
+        } finally {
+            ds.endUpdate();
         }
-        ds.endUpdate();
 
         for (Node n : affectedNodes) {
             if (n.getCoor().isOutSideWorld()) {
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index dc0ff81..02c8e43 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -32,6 +32,7 @@ import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Tools / Orthogonalize
@@ -67,8 +68,8 @@ public final class OrthogonalizeAction extends JosmAction {
      *
      * Current policy is to except just everything, no matter how strange the result would be.
      */
-    private static final double TOLERANCE1 = Math.toRadians(45.);   // within a way
-    private static final double TOLERANCE2 = Math.toRadians(45.);   // ways relative to each other
+    private static final double TOLERANCE1 = Utils.toRadians(45.);   // within a way
+    private static final double TOLERANCE2 = Utils.toRadians(45.);   // ways relative to each other
 
     /**
      * Remember movements, so the user can later undo it for certain nodes
diff --git a/src/org/openstreetmap/josm/actions/ReverseWayAction.java b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
index c16a563..2e9858e 100644
--- a/src/org/openstreetmap/josm/actions/ReverseWayAction.java
+++ b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
@@ -28,23 +28,43 @@ import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
 
+/**
+ * Reverses the ways that are currently selected by the user
+ */
 public final class ReverseWayAction extends JosmAction {
 
+    /**
+     * The resulting way after reversing it and the commands to get there.
+     */
     public static class ReverseWayResult {
         private final Way newWay;
         private final Collection<Command> tagCorrectionCommands;
         private final Command reverseCommand;
 
+        /**
+         * Create a new {@link ReverseWayResult}
+         * @param newWay The new way primitive
+         * @param tagCorrectionCommands The commands to correct the tags
+         * @param reverseCommand The command to reverse the way
+         */
         public ReverseWayResult(Way newWay, Collection<Command> tagCorrectionCommands, Command reverseCommand) {
             this.newWay = newWay;
             this.tagCorrectionCommands = tagCorrectionCommands;
             this.reverseCommand = reverseCommand;
         }
 
+        /**
+         * Gets the new way object
+         * @return The new, reversed way
+         */
         public Way getNewWay() {
             return newWay;
         }
 
+        /**
+         * Gets the commands that will be required to do a full way reversal including changing the tags
+         * @return The comamnds
+         */
         public Collection<Command> getCommands() {
             List<Command> c = new ArrayList<>();
             c.addAll(tagCorrectionCommands);
@@ -52,19 +72,34 @@ public final class ReverseWayAction extends JosmAction {
             return c;
         }
 
+        /**
+         * Gets a single sequence command for reversing this way including changing the tags
+         * @return the command
+         */
         public Command getAsSequenceCommand() {
             return new SequenceCommand(tr("Reverse way"), getCommands());
         }
 
+        /**
+         * Gets the basic reverse command that only changes the order of the nodes.
+         * @return The reorder nodes command
+         */
         public Command getReverseCommand() {
             return reverseCommand;
         }
 
+        /**
+         * Gets the command to change the tags of the way
+         * @return The command to reverse the tags
+         */
         public Collection<Command> getTagCorrectionCommands() {
             return tagCorrectionCommands;
         }
     }
 
+    /**
+     * Creates a new {@link ReverseWayAction} and binds the shortcut
+     */
     public ReverseWayAction() {
         super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
                 Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
@@ -87,7 +122,6 @@ public final class ReverseWayAction extends JosmAction {
             return;
         }
 
-        boolean propertiesUpdated = false;
         Collection<Command> c = new LinkedList<>();
         for (Way w : sel) {
             ReverseWayResult revResult;
@@ -98,13 +132,8 @@ public final class ReverseWayAction extends JosmAction {
                 return;
             }
             c.addAll(revResult.getCommands());
-            propertiesUpdated |= !revResult.getTagCorrectionCommands().isEmpty();
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
-        // FIXME: This should be handled by undoRedo.
-        if (propertiesUpdated) {
-            ds.fireSelectionChanged();
-        }
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java b/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
index f63f6d3..6dbdeb0 100644
--- a/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
+++ b/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
@@ -159,6 +159,6 @@ public class SelectNonBranchingWaySequences {
         } while (way != null);
 
         if (selectionChanged)
-            data.setSelected(selection, true);
+            data.setSelected(selection);
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
index 3d70f74..a7ad5d9 100644
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -83,8 +83,12 @@ public final class ShowStatusReportAction extends JosmAction {
         StringBuilder text = new StringBuilder(256);
         String runtimeVersion = System.getProperty("java.runtime.version");
         text.append(Version.getInstance().getReleaseAttributes())
-            .append("\nIdentification: ").append(Version.getInstance().getAgentString())
-            .append("\nMemory Usage: ")
+            .append("\nIdentification: ").append(Version.getInstance().getAgentString());
+        String buildNumber = Main.platform.getOSBuildNumber();
+        if (!buildNumber.isEmpty()) {
+            text.append("\nOS Build number: ").append(buildNumber);
+        }
+        text.append("\nMemory Usage: ")
             .append(Runtime.getRuntime().totalMemory()/1024/1024)
             .append(" MB / ")
             .append(Runtime.getRuntime().maxMemory()/1024/1024)
diff --git a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index dff5e17..1dc1f76 100644
--- a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
@@ -243,10 +243,11 @@ public class SimplifyWayAction extends JosmAction {
         double xtemax = 0;
         for (int i = from + 1; i < to; i++) {
             Node n = wnew.get(i);
+            // CHECKSTYLE.OFF: SingleSpaceSeparator
             double xte = Math.abs(Ellipsoid.WGS84.a
-                    * xtd(fromN.getCoor().lat() * Math.PI / 180, fromN.getCoor().lon() * Math.PI / 180, toN.getCoor().lat() * Math.PI
-                            / 180, toN.getCoor().lon() * Math.PI / 180, n.getCoor().lat() * Math.PI / 180, n.getCoor().lon() * Math.PI
-                            / 180));
+                    * xtd(fromN.lat() * Math.PI / 180, fromN.lon() * Math.PI / 180, toN.lat() * Math.PI / 180,
+                            toN.lon() * Math.PI / 180,     n.lat() * Math.PI / 180,   n.lon() * Math.PI / 180));
+            // CHECKSTYLE.ON: SingleSpaceSeparator
             if (xte > xtemax) {
                 xtemax = xte;
                 imax = i;
diff --git a/src/org/openstreetmap/josm/actions/ValidateAction.java b/src/org/openstreetmap/josm/actions/ValidateAction.java
index cd0bd80..f926943 100644
--- a/src/org/openstreetmap/josm/actions/ValidateAction.java
+++ b/src/org/openstreetmap/josm/actions/ValidateAction.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -140,7 +141,8 @@ public class ValidateAction extends JosmAction {
             GuiHelper.runInEDT(() -> {
                 Main.map.validatorDialog.tree.setErrors(errors);
                 Main.map.validatorDialog.unfurlDialog();
-                Main.getLayerManager().getEditDataSet().fireSelectionChanged();
+                //FIXME: nicer way to find / invalidate the corresponding error layer
+                Main.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
             });
         }
 
diff --git a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
index 13c232a..8ad4082 100644
--- a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
@@ -8,6 +8,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -35,7 +36,7 @@ public class ViewportFollowToggleAction extends ToggleAction {
     @Override
     public void actionPerformed(ActionEvent e) {
         toggleSelectedState(e);
-        Main.map.mapView.viewportFollowing = isSelected();
+        DrawAction.VIEWPORT_FOLLOWING.put(isSelected());
         notifySelectedState();
     }
 
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index bcc49d3..8c0f1b3 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -278,7 +278,7 @@ public class DownloadOsmTask extends AbstractDownloadTask<DataSet> {
                 layer = Optional.ofNullable(getEditLayer()).orElseGet(this::getFirstDataLayer);
                 Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
                 layer.mergeFrom(dataSet);
-                if (Main.map != null && zoomAfterDownload) {
+                if (Main.map != null && zoomAfterDownload && bounds != null) {
                     Main.map.mapView.zoomTo(new ViewportData(computeBbox(bounds)));
                 }
                 if (!primitivesToUpdate.isEmpty()) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index d501bdd..a1ffca9 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -73,9 +73,15 @@ import org.openstreetmap.josm.tools.Utils;
  */
 public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, KeyPressReleaseListener, ModifierListener {
 
+    /**
+     * If this property is set, the draw action moves the viewport when adding new points.
+     * @since 12182
+     */
+    public static final CachingProperty<Boolean> VIEWPORT_FOLLOWING = new BooleanProperty("draw.viewport.following", false).cached();
+
     private static final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(), Color.ORANGE.getGreen(), Color.ORANGE.getBlue(), 128);
 
-    private static final ArrowPaintHelper START_WAY_INDICATOR = new ArrowPaintHelper(Math.toRadians(90), 8);
+    private static final ArrowPaintHelper START_WAY_INDICATOR = new ArrowPaintHelper(Utils.toRadians(90), 8);
 
     static final CachingProperty<Boolean> USE_REPEATED_SHORTCUT
             = new BooleanProperty("draw.anglesnap.toggleOnRepeatedA", true).cached();
@@ -237,9 +243,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
 
     private static void addRemoveSelection(DataSet ds, OsmPrimitive toAdd, OsmPrimitive toRemove) {
         ds.beginUpdate(); // to prevent the selection listener to screw around with the state
-        ds.addSelected(toAdd);
-        ds.clearSelection(toRemove);
-        ds.endUpdate();
+        try {
+            ds.addSelected(toAdd);
+            ds.clearSelection(toRemove);
+        } finally {
+            ds.endUpdate();
+        }
     }
 
     @Override
@@ -289,14 +298,6 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
         removeHighlighting();
         Main.map.keyDetector.removeKeyListener(this);
         Main.map.keyDetector.removeModifierListener(this);
-
-        // when exiting we let everybody know about the currently selected
-        // primitives
-        //
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds != null) {
-            ds.fireSelectionChanged();
-        }
     }
 
     /**
@@ -355,9 +356,6 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
      * the helper line until the user chooses to draw something else.
      */
     private void finishDrawing() {
-        // let everybody else know about the current selection
-        //
-        Main.getLayerManager().getEditDataSet().fireSelectionChanged();
         lastUsedNode = null;
         wayIsFinished = true;
         Main.map.selectSelectTool(true);
@@ -621,7 +619,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
 
         // "viewport following" mode for tracing long features
         // from aerial imagery or GPS tracks.
-        if (Main.map.mapView.viewportFollowing) {
+        if (VIEWPORT_FOLLOWING.get()) {
             Main.map.mapView.smoothScrollTo(n.getEastNorth());
         }
         computeHelperLine();
@@ -846,13 +844,13 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
             return; // Don't create zero length way segments.
 
 
-        double curHdg = Math.toDegrees(getCurrentBaseNode().getEastNorth()
+        double curHdg = Utils.toDegrees(getCurrentBaseNode().getEastNorth()
                 .heading(currentMouseEastNorth));
         double baseHdg = -1;
         if (previousNode != null) {
             EastNorth en = previousNode.getEastNorth();
             if (en != null) {
-                baseHdg = Math.toDegrees(en.heading(getCurrentBaseNode().getEastNorth()));
+                baseHdg = Utils.toDegrees(en.heading(getCurrentBaseNode().getEastNorth()));
             }
         }
 
@@ -1159,7 +1157,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
                 // don't draw line if we don't know where from or where to
                 || currentMouseEastNorth == null || getCurrentBaseNode() == null
                 // don't draw line if mouse is outside window
-                || !Main.map.mapView.getBounds().contains(mousePos))
+                || !Main.map.mapView.getState().getForView(mousePos.getX(), mousePos.getY()).isInView())
             return;
 
         Graphics2D g2 = g;
@@ -1297,7 +1295,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
     @Override
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         DataSet ds = getLayerManager().getEditDataSet();
-        return ds != null ? ds.getSelected() : null;
+        return ds != null ? ds.getSelected() : Collections.emptySet();
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java b/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
index c0ee821..33ca741 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.draw.SymbolShape;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.Utils;
 
 class DrawSnapHelper {
 
@@ -376,7 +377,7 @@ class DrawSnapHelper {
         // find out the distance, in metres, between the base point and projected point
         LatLon mouseLatLon = Main.map.mapView.getProjection().eastNorth2latlon(snapPoint);
         double distance = this.drawAction.getCurrentBaseNode().getCoor().greatCircleDistance(mouseLatLon);
-        double hdg = Math.toDegrees(p0.heading(snapPoint));
+        double hdg = Utils.toDegrees(p0.heading(snapPoint));
         // heading of segment from current to calculated point, not to mouse position
 
         if (baseHeading >= 0) { // there is previous line segment with some heading
@@ -484,7 +485,7 @@ class DrawSnapHelper {
         segmentPoint2 = seg.getSecondNode().getEastNorth();
 
         double hdg = segmentPoint1.heading(segmentPoint2);
-        hdg = Math.toDegrees(hdg);
+        hdg = Utils.toDegrees(hdg);
         if (hdg < 0) {
             hdg += 360;
         }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 701fe58..aaaf2ab 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -43,8 +43,8 @@ import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.ModifierListener;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -89,7 +89,7 @@ import org.openstreetmap.josm.tools.Shortcut;
  *
  * @author Ole Jørgen Brønner (olejorgenb)
  */
-public class ParallelWayAction extends MapMode implements ModifierListener, MapViewPaintable {
+public class ParallelWayAction extends MapMode implements ModifierListener {
 
     private static final CachingProperty<BasicStroke> HELPER_LINE_STROKE = new StrokeProperty(prefKey("stroke.hepler-line"), "1").cached();
     private static final CachingProperty<BasicStroke> REF_LINE_STROKE = new StrokeProperty(prefKey("stroke.ref-line"), "2 2 3").cached();
@@ -144,6 +144,8 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
     private EastNorth helperLineStart;
     private EastNorth helperLineEnd;
 
+    private final ParallelWayLayer temporaryLayer = new ParallelWayLayer();
+
     /**
      * Constructs a new {@code ParallelWayAction}.
      * @param mapFrame Map frame
@@ -167,7 +169,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
 
         mv.addMouseListener(this);
         mv.addMouseMotionListener(this);
-        mv.addTemporaryLayer(this);
+        mv.addTemporaryLayer(temporaryLayer);
 
         //// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
         Main.map.keyDetector.addModifierListener(this);
@@ -175,7 +177,6 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
         for (Way w : sourceWays) {
             w.setHighlighted(true);
         }
-        mv.repaint();
     }
 
     @Override
@@ -183,7 +184,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
         super.exitMode();
         mv.removeMouseListener(this);
         mv.removeMouseMotionListener(this);
-        mv.removeTemporaryLayer(this);
+        mv.removeTemporaryLayer(temporaryLayer);
         Main.map.statusLine.setDist(-1);
         Main.map.statusLine.repaint();
         Main.map.keyDetector.removeModifierListener(this);
@@ -191,7 +192,6 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
         pWays = null;
         sourceWays = null;
         referenceSegment = null;
-        mv.repaint();
     }
 
     @Override
@@ -335,7 +335,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
 
         setMode(Mode.NORMAL);
         resetMouseTrackingState();
-        mv.repaint();
+        temporaryLayer.invalidate();
     }
 
     private static void removeWayHighlighting(Collection<Way> ways) {
@@ -432,7 +432,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
 
         Main.map.statusLine.setDist(Math.abs(snappedRealD));
         Main.map.statusLine.repaint();
-        mv.repaint();
+        temporaryLayer.invalidate();
     }
 
     private boolean matchesCurrentModifiers(CachingProperty<Map<Modifier, Boolean>> spec) {
@@ -453,29 +453,6 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
         return spec.entrySet().stream().allMatch(entry -> modifiers.contains(entry.getKey()) == entry.getValue().booleanValue());
     }
 
-    @Override
-    public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-        if (mode == Mode.DRAGGING) {
-            CheckParameterUtil.ensureParameterNotNull(mv, "mv");
-
-            Color mainColor = MAIN_COLOR.get();
-            // FIXME: should clip the line (gets insanely slow when zoomed in on a very long line
-            g.setStroke(REF_LINE_STROKE.get());
-            g.setColor(mainColor);
-            MapViewPath line = new MapViewPath(mv);
-            line.moveTo(referenceSegment.getFirstNode());
-            line.lineTo(referenceSegment.getSecondNode());
-            g.draw(line.computeClippedLine(g.getStroke()));
-
-            g.setStroke(HELPER_LINE_STROKE.get());
-            g.setColor(mainColor);
-            line = new MapViewPath(mv);
-            line.moveTo(helperLineStart);
-            line.lineTo(helperLineEnd);
-            g.draw(line.computeClippedLine(g.getStroke()));
-        }
-    }
-
     private boolean isModifiersValidForDragMode() {
         return (!alt && !shift && !ctrl) || matchesCurrentModifiers(SNAP_MODIFIER_COMBO)
                 || matchesCurrentModifiers(COPY_TAGS_MODIFIER_COMBO);
@@ -634,4 +611,28 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
             return Stream.of(values()).filter(m -> m.shortChar == Character.toLowerCase(charCode)).findAny();
         }
     }
+
+    private class ParallelWayLayer extends AbstractMapViewPaintable {
+        @Override
+        public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+            if (mode == Mode.DRAGGING) {
+                CheckParameterUtil.ensureParameterNotNull(mv, "mv");
+
+                Color mainColor = MAIN_COLOR.get();
+                g.setStroke(REF_LINE_STROKE.get());
+                g.setColor(mainColor);
+                MapViewPath line = new MapViewPath(mv);
+                line.moveTo(referenceSegment.getFirstNode());
+                line.lineTo(referenceSegment.getSecondNode());
+                g.draw(line.computeClippedLine(g.getStroke()));
+
+                g.setStroke(HELPER_LINE_STROKE.get());
+                g.setColor(mainColor);
+                line = new MapViewPath(mv);
+                line.moveTo(helperLineStart);
+                line.lineTo(helperLineEnd);
+                g.draw(line.computeClippedLine(g.getStroke()));
+            }
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index b6ec5f8..0805b96 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -710,31 +710,35 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
         if (affectedNodes.size() < 2 && (mode == Mode.ROTATE || mode == Mode.SCALE)) {
             return false;
         }
-        Command c = getLastCommand();
+        Command c = getLastCommandInDataset(ds);
         if (mode == Mode.MOVE) {
             if (startEN == null) return false; // fix #8128
             ds.beginUpdate();
-            if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-                ((MoveCommand) c).saveCheckpoint();
-                ((MoveCommand) c).applyVectorTo(currentEN);
-            } else {
-                c = new MoveCommand(selection, startEN, currentEN);
-                Main.main.undoRedo.add(c);
-            }
-            for (Node n : affectedNodes) {
-                LatLon ll = n.getCoor();
-                if (ll != null && ll.isOutSideWorld()) {
-                    // Revert move
-                    ((MoveCommand) c).resetToCheckpoint();
-                    ds.endUpdate();
-                    JOptionPane.showMessageDialog(
-                            Main.parent,
-                            tr("Cannot move objects outside of the world."),
-                            tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE);
-                    mv.setNewCursor(cursor, this);
-                    return false;
+            try {
+                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
+                    ((MoveCommand) c).saveCheckpoint();
+                    ((MoveCommand) c).applyVectorTo(currentEN);
+                } else {
+                    c = new MoveCommand(selection, startEN, currentEN);
+                    Main.main.undoRedo.add(c);
+                }
+                for (Node n : affectedNodes) {
+                    LatLon ll = n.getCoor();
+                    if (ll != null && ll.isOutSideWorld()) {
+                        // Revert move
+                        ((MoveCommand) c).resetToCheckpoint();
+                        // TODO: We might use a simple notification in the lower left corner.
+                        JOptionPane.showMessageDialog(
+                                Main.parent,
+                                tr("Cannot move objects outside of the world."),
+                                tr("Warning"),
+                                JOptionPane.WARNING_MESSAGE);
+                        mv.setNewCursor(cursor, this);
+                        return false;
+                    }
                 }
+            } finally {
+                ds.endUpdate();
             }
         } else {
             startEN = currentEN; // drag can continue after scaling/rotation
@@ -744,27 +748,29 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
             }
 
             ds.beginUpdate();
-
-            if (mode == Mode.ROTATE) {
-                if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
-                    ((RotateCommand) c).handleEvent(currentEN);
-                } else {
-                    Main.main.undoRedo.add(new RotateCommand(selection, currentEN));
-                }
-            } else if (mode == Mode.SCALE) {
-                if (c instanceof ScaleCommand && affectedNodes.equals(((ScaleCommand) c).getTransformedNodes())) {
-                    ((ScaleCommand) c).handleEvent(currentEN);
-                } else {
-                    Main.main.undoRedo.add(new ScaleCommand(selection, currentEN));
+            try {
+                if (mode == Mode.ROTATE) {
+                    if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
+                        ((RotateCommand) c).handleEvent(currentEN);
+                    } else {
+                        Main.main.undoRedo.add(new RotateCommand(selection, currentEN));
+                    }
+                } else if (mode == Mode.SCALE) {
+                    if (c instanceof ScaleCommand && affectedNodes.equals(((ScaleCommand) c).getTransformedNodes())) {
+                        ((ScaleCommand) c).handleEvent(currentEN);
+                    } else {
+                        Main.main.undoRedo.add(new ScaleCommand(selection, currentEN));
+                    }
                 }
-            }
 
-            Collection<Way> ways = ds.getSelectedWays();
-            if (doesImpactStatusLine(affectedNodes, ways)) {
-                Main.map.statusLine.setDist(ways);
+                Collection<Way> ways = ds.getSelectedWays();
+                if (doesImpactStatusLine(affectedNodes, ways)) {
+                    Main.map.statusLine.setDist(ways);
+                }
+            } finally {
+                ds.endUpdate();
             }
         }
-        ds.endUpdate();
         return true;
     }
 
@@ -783,8 +789,9 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
      * Adapt last move command (if it is suitable) to work with next drag, started at point startEN
      */
     private void useLastMoveCommandIfPossible() {
-        Command c = getLastCommand();
-        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(getLayerManager().getEditDataSet().getSelected());
+        DataSet dataSet = getLayerManager().getEditDataSet();
+        Command c = getLastCommandInDataset(dataSet);
+        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(dataSet.getSelected());
         if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
             // old command was created with different base point of movement, we need to recalculate it
             ((MoveCommand) c).changeStartPoint(startEN);
@@ -793,15 +800,21 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
 
     /**
      * Obtain command in undoRedo stack to "continue" when dragging
+     * @param ds The data set the command needs to be in.
      * @return last command
      */
-    private static Command getLastCommand() {
-        Command c = !Main.main.undoRedo.commands.isEmpty()
-                ? Main.main.undoRedo.commands.getLast() : null;
-        if (c instanceof SequenceCommand) {
-            c = ((SequenceCommand) c).getLastCommand();
+    private static Command getLastCommandInDataset(DataSet ds) {
+        LinkedList<Command> commands = Main.main.undoRedo.commands;
+        if (!commands.isEmpty()) {
+            Command lastCommand = commands.getLast();
+            if (lastCommand instanceof SequenceCommand) {
+                lastCommand = ((SequenceCommand) lastCommand).getLastCommand();
+            }
+            if (ds.equals(lastCommand.getAffectedDataSet())) {
+                return lastCommand;
+            }
         }
-        return c;
+        return null;
     }
 
     /**
@@ -849,7 +862,6 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
             updateKeyModifiers(e);
             if (ctrl) mergePrims(e.getPoint());
         }
-        getLayerManager().getEditDataSet().fireSelectionChanged();
     }
 
     static class ConfirmMoveDialog extends ExtendedDialog {
@@ -898,17 +910,19 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
             // Move all selected primitive to preserve shape #10748
             Collection<OsmPrimitive> selection = ds.getSelectedNodesAndWays();
             Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-            Command c = getLastCommand();
+            Command c = getLastCommandInDataset(ds);
             ds.beginUpdate();
-            if (c instanceof MoveCommand
-                && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-                Node selectedNode = selNodes.iterator().next();
-                EastNorth selectedEN = selectedNode.getEastNorth();
-                EastNorth targetEN = target.getEastNorth();
-                ((MoveCommand) c).moveAgain(targetEN.getX() - selectedEN.getX(),
-                                            targetEN.getY() - selectedEN.getY());
+            try {
+                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
+                    Node selectedNode = selNodes.iterator().next();
+                    EastNorth selectedEN = selectedNode.getEastNorth();
+                    EastNorth targetEN = target.getEastNorth();
+                    ((MoveCommand) c).moveAgain(targetEN.getX() - selectedEN.getX(),
+                                                targetEN.getY() - selectedEN.getY());
+                }
+            } finally {
+                ds.endUpdate();
             }
-            ds.endUpdate();
         }
 
         Collection<Node> nodesToMerge = new LinkedList<>(selNodes);
diff --git a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
index 6d32ccf..52f5307 100644
--- a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
@@ -148,7 +149,7 @@ public class ValidateUploadHook implements UploadHook {
             OsmValidator.initializeTests();
             OsmValidator.initializeErrorLayer();
             Main.map.validatorDialog.unfurlDialog();
-            Main.getLayerManager().getEditDataSet().fireSelectionChanged();
+            Main.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
             return false;
         }
         return true;
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index d23322c..22c4af8 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -141,9 +141,9 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
 
             if (key.startsWith("oneway") || key.endsWith("oneway")) {
                 if (OsmUtils.isReversed(value)) {
-                    newValue = OsmUtils.trueval;
+                    newValue = OsmUtils.TRUE_VALUE;
                 } else if (OsmUtils.isTrue(value)) {
-                    newValue = OsmUtils.reverseval;
+                    newValue = OsmUtils.REVERSE_VALUE;
                 }
                 newKey = COMBINED_SWITCHERS.apply(key);
             } else if (key.startsWith("incline") || key.endsWith("incline")) {
@@ -263,7 +263,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
 
     static Map<OsmPrimitive, List<TagCorrection>> getTagCorrectionsMap(Way way) {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap = new HashMap<>();
-        List<TagCorrection> tagCorrections = getTagCorrections((Tagged) way);
+        List<TagCorrection> tagCorrections = getTagCorrections(way);
         if (!tagCorrections.isEmpty()) {
             tagCorrectionsMap.put(way, tagCorrections);
         }
diff --git a/src/org/openstreetmap/josm/data/Bounds.java b/src/org/openstreetmap/josm/data/Bounds.java
index 78ec1ae..8b01cb3 100644
--- a/src/org/openstreetmap/josm/data/Bounds.java
+++ b/src/org/openstreetmap/josm/data/Bounds.java
@@ -9,6 +9,7 @@ import java.text.MessageFormat;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -19,6 +20,8 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
  * lat/lon min/max values.  The values are rounded to LatLon.OSM_SERVER_PRECISION
  *
  * @author imi
+ *
+ * @see BBox to represent invalid areas.
  */
 public class Bounds {
     /**
@@ -389,10 +392,28 @@ public class Bounds {
 
     /**
      * Determines if the given point {@code ll} is within these bounds.
+     * <p>
+     * Points with unknown coordinates are always outside the coordinates.
      * @param ll The lat/lon to check
      * @return {@code true} if {@code ll} is within these bounds, {@code false} otherwise
      */
     public boolean contains(LatLon ll) {
+        // binary compatibility
+        return contains((ILatLon) ll);
+    }
+
+    /**
+     * Determines if the given point {@code ll} is within these bounds.
+     * <p>
+     * Points with unknown coordinates are always outside the coordinates.
+     * @param ll The lat/lon to check
+     * @return {@code true} if {@code ll} is within these bounds, {@code false} otherwise
+     * @since 12161
+     */
+    public boolean contains(ILatLon ll) {
+        if (!ll.isLatLonKnown()) {
+            return false;
+        }
         if (ll.lat() < minLat || ll.lat() > maxLat)
             return false;
         if (crosses180thMeridian()) {
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 23db172..af35463 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -1404,7 +1404,6 @@ public class Preferences {
 
     /**
      * Updates system properties with the current values in the preferences.
-     *
      */
     public void updateSystemProperties() {
         if ("true".equals(get("prefer.ipv6", "auto")) && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
@@ -1416,7 +1415,7 @@ public class Preferences {
         // Workaround to fix a Java bug. This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
         // Force AWT toolkit to update its internal preferences (fix #6345).
         // Does not work anymore with Java 9, to remove with Java 9 migration
-        if (!GraphicsEnvironment.isHeadless()) {
+        if (Utils.getJavaVersion() < 9 && !GraphicsEnvironment.isHeadless()) {
             try {
                 Field field = Toolkit.class.getDeclaredField("resources");
                 Utils.setObjectsAccessible(field);
@@ -1534,12 +1533,7 @@ public class Preferences {
     private void migrateOldColorKeys() {
         settingsMap.keySet().stream()
                 .filter(key -> key.startsWith(COLOR_PREFIX))
-                .flatMap(key -> {
-                    final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
-                    return key.equals(newKey) || settingsMap.containsKey(newKey)
-                            ? Stream.empty()
-                            : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
-                })
+                .flatMap(this::searchOldColorKey)
                 .collect(Collectors.toList()) // to avoid ConcurrentModificationException
                 .forEach(entry -> {
                     final String oldKey = entry.getKey();
@@ -1550,6 +1544,13 @@ public class Preferences {
                 });
     }
 
+    private Stream<AbstractMap.SimpleImmutableEntry<String, String>> searchOldColorKey(String key) {
+        final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
+        return key.equals(newKey) || settingsMap.containsKey(newKey)
+                ? Stream.empty()
+                : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
+    }
+
     private void removeUrlFromEntries(int loadedVersion, int versionMax, String key, String urlPart) {
         if (loadedVersion < versionMax) {
             Setting<?> setting = settingsMap.get(key);
diff --git a/src/org/openstreetmap/josm/data/SelectionChangedListener.java b/src/org/openstreetmap/josm/data/SelectionChangedListener.java
index 300ab7d..e682614 100644
--- a/src/org/openstreetmap/josm/data/SelectionChangedListener.java
+++ b/src/org/openstreetmap/josm/data/SelectionChangedListener.java
@@ -3,7 +3,9 @@ package org.openstreetmap.josm.data;
 
 import java.util.Collection;
 
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 
 /**
  * This is a listener for selection changes through the dataset's data. Whenever
@@ -14,6 +16,9 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
  * Swing event queue and packed together. So only one selection changed event
  * is issued within a one message dispatch routine.
  *
+ * @see DataSelectionListener For a more advanced listener class.
+ * @see SelectionEventManager For managing your selection events.
+ *
  * @author imi
  * @since     8 (creation)
  * @since 10600 (functional interface)
diff --git a/src/org/openstreetmap/josm/data/coor/CachedLatLon.java b/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
index 12ee12b..f464d91 100644
--- a/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.coor;
 import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projection;
 
 /**
@@ -19,7 +20,7 @@ public class CachedLatLon extends LatLon {
     private static final long serialVersionUID = 1L;
 
     private EastNorth eastNorth;
-    private transient Projection proj;
+    private transient Object cacheKey;
 
     /**
      * Constructs a new {@code CachedLatLon}.
@@ -36,7 +37,7 @@ public class CachedLatLon extends LatLon {
      */
     public CachedLatLon(LatLon coor) {
         super(coor.lat(), coor.lon());
-        proj = null;
+        cacheKey = null;
     }
 
     /**
@@ -44,8 +45,12 @@ public class CachedLatLon extends LatLon {
      * @param eastNorth easting/northing
      */
     public CachedLatLon(EastNorth eastNorth) {
-        super(Main.getProjection().eastNorth2latlon(eastNorth));
-        proj = Main.getProjection();
+        this(eastNorth, Main.getProjection());
+    }
+
+    private CachedLatLon(EastNorth eastNorth, Projection projection) {
+        super(projection.eastNorth2latlon(eastNorth));
+        cacheKey = projection.getCacheKey();
         this.eastNorth = eastNorth;
     }
 
@@ -54,10 +59,11 @@ public class CachedLatLon extends LatLon {
      *
      * @return the internally cached east/north coordinates. null, if the globally defined projection is null
      */
-    public final EastNorth getEastNorth() {
-        if (!Objects.equals(proj, Main.getProjection())) {
-            proj = Main.getProjection();
-            eastNorth = proj.latlon2eastNorth(this);
+    @Override
+    public final EastNorth getEastNorth(Projecting projecting) {
+        if (!Objects.equals(cacheKey, projecting.getCacheKey())) {
+            cacheKey = projecting.getCacheKey();
+            eastNorth = projecting.latlon2eastNorth(this);
         }
         return eastNorth;
     }
diff --git a/src/org/openstreetmap/josm/data/coor/EastNorth.java b/src/org/openstreetmap/josm/data/coor/EastNorth.java
index 6a1e942..e82ae5b 100644
--- a/src/org/openstreetmap/josm/data/coor/EastNorth.java
+++ b/src/org/openstreetmap/josm/data/coor/EastNorth.java
@@ -15,6 +15,8 @@ public class EastNorth extends Coordinate {
 
     private static final long serialVersionUID = 1L;
 
+    public static final EastNorth ZERO = new EastNorth(0, 0);
+
     /**
      * Constructs a new {@code EastNorth}.
      * @param east easting
diff --git a/src/org/openstreetmap/josm/data/coor/ILatLon.java b/src/org/openstreetmap/josm/data/coor/ILatLon.java
new file mode 100644
index 0000000..47cdec0
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/coor/ILatLon.java
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.coor;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projecting;
+
+/**
+ * This interface represents a coordinate in LatLon space.
+ * <p>
+ * It provides methods to get the coordinates. The coordinates may be unknown.
+ * In this case, both {@link #lat()} and {@link #lon()} need to return a NaN value and {@link #isLatLonKnown()} needs to return false.
+ * <p>
+ * Whether the coordinates are immutable or not is implementation specific.
+ *
+ * @author Michael Zangl
+ * @since 12161
+ */
+public interface ILatLon {
+
+    /**
+     * Returns the longitude, i.e., the east-west position in degrees.
+     * @return the longitude or NaN if {@link #isLatLonKnown()} returns false
+     */
+    double lon();
+
+    /**
+     * Returns the latitude, i.e., the north-south position in degrees.
+     * @return the latitude or NaN if {@link #isLatLonKnown()} returns false
+     */
+    double lat();
+
+    /**
+     * Determines if this object has valid coordinates.
+     * @return {@code true} if this object has valid coordinates
+     */
+    default boolean isLatLonKnown() {
+        return !Double.isNaN(lat()) && !Double.isNaN(lon());
+    }
+
+    /**
+     * <p>Replies the projected east/north coordinates.</p>
+     *
+     * <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.</p>
+     *
+     * @return the east north coordinates or {@code null} if #is
+     */
+    default EastNorth getEastNorth() {
+        return getEastNorth(Main.getProjection());
+    }
+
+    /**
+     * Replies the projected east/north coordinates.
+     * <p>
+     * The result of the last conversion may be cached. Null is returned in case this object is invalid.
+     * @param projecting The projection to use.
+     * @return The projected east/north coordinates
+     * @since 10827
+     */
+    default EastNorth getEastNorth(Projecting projecting) {
+        if (!isLatLonKnown()) {
+            return null;
+        } else {
+            return projecting.latlon2eastNorth(this);
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index ca75fec..28e6dd7 100644
--- a/src/org/openstreetmap/josm/data/coor/LatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/LatLon.java
@@ -7,9 +7,9 @@ import static java.lang.Math.atan2;
 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 static org.openstreetmap.josm.tools.Utils.toRadians;
 
 import java.awt.geom.Area;
 import java.text.DecimalFormat;
@@ -42,7 +42,7 @@ import org.openstreetmap.josm.tools.Utils;
  *
  * @author Imi
  */
-public class LatLon extends Coordinate {
+public class LatLon extends Coordinate implements ILatLon {
 
     private static final long serialVersionUID = 1L;
 
@@ -250,7 +250,11 @@ public class LatLon extends Coordinate {
         super(lon, lat);
     }
 
-    protected LatLon(LatLon coor) {
+    /**
+     * Creates a new LatLon object for the given coordinate
+     * @param coor The coordinates to copy from.
+     */
+    public LatLon(ILatLon coor) {
         super(coor.lon(), coor.lat());
     }
 
@@ -262,10 +266,7 @@ public class LatLon extends Coordinate {
         this(coor.getLat(), coor.getLon());
     }
 
-    /**
-     * Returns the latitude, i.e., the north-south position in degrees.
-     * @return the latitude
-     */
+    @Override
     public double lat() {
         return y;
     }
@@ -280,15 +281,12 @@ public class LatLon extends Coordinate {
         case DECIMAL_DEGREES: return cDdFormatter.format(y);
         case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ? SOUTH : NORTH);
         case NAUTICAL: return dm(y) + ((y < 0) ? SOUTH : NORTH);
-        case EAST_NORTH: return cDdFormatter.format(Main.getProjection().latlon2eastNorth(this).north());
+        case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().north());
         default: return "ERR";
         }
     }
 
-    /**
-     * Returns the longitude, i.e., the east-west position in degrees.
-     * @return the longitude
-     */
+    @Override
     public double lon() {
         return x;
     }
@@ -303,7 +301,7 @@ public class LatLon extends Coordinate {
         case DECIMAL_DEGREES: return cDdFormatter.format(x);
         case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ? WEST : EAST);
         case NAUTICAL: return dm(x) + ((x < 0) ? WEST : EAST);
-        case EAST_NORTH: return cDdFormatter.format(Main.getProjection().latlon2eastNorth(this).east());
+        case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().east());
         default: return "ERR";
         }
     }
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
index edfea57..df6b2fb 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
@@ -7,6 +7,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 
 /**
  * Constants for GPX handling.
@@ -27,21 +28,80 @@ public interface GpxConstants {
     /** Source of data. Included to give user some idea of reliability and accuracy of data. */
     String GPX_SRC = "src";
 
+    /**
+     * Prefix used for all meta values.
+     */
     String META_PREFIX = "meta.";
+    /**
+     * A constant for the metadata hash map: the author name of the file
+     * @see GpxData#get(String)
+     */
     String META_AUTHOR_NAME = META_PREFIX + "author.name";
+    /**
+     * A constant for the metadata hash map: the author email of the file
+     * @see GpxData#get(String)
+     */
     String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
+    /**
+     * A constant for the metadata hash map: a link to a page about the author
+     * @see GpxData#get(String)
+     */
     String META_AUTHOR_LINK = META_PREFIX + "author.link";
+    /**
+     * A constant for the metadata hash map: the author field for the copyright information in the gpx file
+     * @see GpxData#get(String)
+     */
     String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
+    /**
+     * A constant for the metadata hash map: the license of the file
+     * @see GpxData#get(String)
+     */
     String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
+    /**
+     * A constant for the metadata hash map: the year of the license for the file
+     * @see GpxData#get(String)
+     */
     String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
+    /**
+     * A constant for the metadata hash map: a description of the file
+     * @see GpxData#get(String)
+     */
     String META_DESC = META_PREFIX + "desc";
+    /**
+     * A constant for the metadata hash map: the keywords of the file
+     * @see GpxData#get(String)
+     */
     String META_KEYWORDS = META_PREFIX + "keywords";
+    /**
+     * A constant for the metadata hash map: the links. They are stored as list of {@link GpxLink} objects
+     * @see GpxData#get(String)
+     */
     String META_LINKS = META_PREFIX + "links";
+    /**
+     * A constant for the metadata hash map: the name of the file (stored in the file, not the one on the disk)
+     * @see GpxData#get(String)
+     */
     String META_NAME = META_PREFIX + "name";
+    /**
+     * A constant for the metadata hash map: the time as string
+     * @see GpxData#get(String)
+     */
     String META_TIME = META_PREFIX + "time";
+    /**
+     * A constant for the metadata hash map: the bounding box. This is a {@link Bounds} object
+     * @see GpxData#getMetaBounds()
+     */
     String META_BOUNDS = META_PREFIX + "bounds";
+    /**
+     * A constant for the metadata hash map: the extension data. This is a {@link Extensions} object
+     * @see GpxData#addExtension(String, String)
+     * @see GpxData#get(String)
+     */
     String META_EXTENSIONS = META_PREFIX + "extensions";
 
+    /**
+     * A namespace for josm GPX extensions
+     */
     String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
 
     /** Elevation (in meters) of the point. */
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxData.java b/src/org/openstreetmap/josm/data/gpx/GpxData.java
index f9498d5..41a0504 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxData.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxData.java
@@ -2,22 +2,27 @@
 package org.openstreetmap.josm.data.gpx;
 
 import java.io.File;
+import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.DoubleSummaryStatistics;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.gpx.GpxTrack.GpxTrackChangeListener;
+import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.ListeningCollection;
 
 /**
  * Objects of this class represent a gpx file with tracks, waypoints and routes.
@@ -28,18 +33,64 @@ import org.openstreetmap.josm.data.coor.EastNorth;
  */
 public class GpxData extends WithAttributes implements Data {
 
+    /**
+     * The disk file this layer is stored in, if it is a local layer. May be <code>null</code>.
+     */
     public File storageFile;
+    /**
+     * A boolean flag indicating if the data was read from the OSM server.
+     */
     public boolean fromServer;
 
-    /** Creator (usually software) */
+    /**
+     * Creator metadata for this file (usually software)
+     */
     public String creator;
 
-    /** Tracks */
-    public final Collection<GpxTrack> tracks = new LinkedList<>();
-    /** Routes */
-    public final Collection<GpxRoute> routes = new LinkedList<>();
-    /** Waypoints */
-    public final Collection<WayPoint> waypoints = new LinkedList<>();
+    /**
+     * A list of tracks this file consists of
+     */
+    private final ArrayList<GpxTrack> privateTracks = new ArrayList<>();
+    /**
+     * GXP routes in this file
+     */
+    private final ArrayList<GpxRoute> privateRoutes = new ArrayList<>();
+    /**
+     * Addidionaly waypoints for this file.
+     */
+    private final ArrayList<WayPoint> privateWaypoints = new ArrayList<>();
+    private final GpxTrackChangeListener proxy = e -> fireInvalidate();
+
+    /**
+     * Tracks. Access is discouraged, use {@link #getTracks()} to read.
+     * @see #getTracks()
+     */
+    public final Collection<GpxTrack> tracks = new ListeningCollection<GpxTrack>(privateTracks, this::fireInvalidate) {
+
+        @Override
+        protected void removed(GpxTrack cursor) {
+            cursor.removeListener(proxy);
+            super.removed(cursor);
+        }
+
+        @Override
+        protected void added(GpxTrack cursor) {
+            super.added(cursor);
+            cursor.addListener(proxy);
+        }
+    };
+
+    /**
+     * Routes. Access is discouraged, use {@link #getTracks()} to read.
+     * @see #getRoutes()
+     */
+    public final Collection<GpxRoute> routes = new ListeningCollection<>(privateRoutes, this::fireInvalidate);
+
+    /**
+     * Waypoints. Access is discouraged, use {@link #getTracks()} to read.
+     * @see #getWaypoints()
+     */
+    public final Collection<WayPoint> waypoints = new ListeningCollection<>(privateWaypoints, this::fireInvalidate);
 
     /**
      * All data sources (bounds of downloaded bounds) of this GpxData.<br>
@@ -49,6 +100,8 @@ public class GpxData extends WithAttributes implements Data {
      */
     public final Set<DataSource> dataSources = new HashSet<>();
 
+    private final ListenerList<GpxDataChangeListener> listeners = ListenerList.create();
+
     /**
      * Merges data from another object.
      * @param other existing GPX data
@@ -71,10 +124,114 @@ public class GpxData extends WithAttributes implements Data {
                 put(k, ent.getValue());
             }
         }
-        tracks.addAll(other.tracks);
-        routes.addAll(other.routes);
-        waypoints.addAll(other.waypoints);
+        other.getTracks().forEach(this::addTrack);
+        other.getRoutes().forEach(this::addRoute);
+        other.getWaypoints().forEach(this::addWaypoint);
         dataSources.addAll(other.dataSources);
+        fireInvalidate();
+    }
+
+    /**
+     * Get all tracks contained in this data set.
+     * @return The tracks.
+     */
+    public Collection<GpxTrack> getTracks() {
+        return Collections.unmodifiableCollection(privateTracks);
+    }
+
+    /**
+     * Add a new track
+     * @param track The new track
+     * @since 12156
+     */
+    public void addTrack(GpxTrack track) {
+        if (privateTracks.stream().anyMatch(t -> t == track)) {
+            throw new IllegalArgumentException(MessageFormat.format("The track was already added to this data: {0}", track));
+        }
+        privateTracks.add(track);
+        track.addListener(proxy);
+        fireInvalidate();
+    }
+
+    /**
+     * Remove a track
+     * @param track The old track
+     * @since 12156
+     */
+    public void removeTrack(GpxTrack track) {
+        if (!privateTracks.removeIf(t -> t == track)) {
+            throw new IllegalArgumentException(MessageFormat.format("The track was not in this data: {0}", track));
+        }
+        track.removeListener(proxy);
+        fireInvalidate();
+    }
+
+    /**
+     * Gets the list of all routes defined in this data set.
+     * @return The routes
+     * @since 12156
+     */
+    public Collection<GpxRoute> getRoutes() {
+        return Collections.unmodifiableCollection(privateRoutes);
+    }
+
+    /**
+     * Add a new route
+     * @param route The new route
+     * @since 12156
+     */
+    public void addRoute(GpxRoute route) {
+        if (privateRoutes.stream().anyMatch(r -> r == route)) {
+            throw new IllegalArgumentException(MessageFormat.format("The route was already added to this data: {0}", route));
+        }
+        privateRoutes.add(route);
+        fireInvalidate();
+    }
+
+    /**
+     * Remove a route
+     * @param route The old route
+     * @since 12156
+     */
+    public void removeRoute(GpxRoute route) {
+        if (!privateRoutes.removeIf(r -> r == route)) {
+            throw new IllegalArgumentException(MessageFormat.format("The route was not in this data: {0}", route));
+        }
+        fireInvalidate();
+    }
+
+    /**
+     * Gets a list of all way points in this data set.
+     * @return The way points.
+     * @since 12156
+     */
+    public Collection<WayPoint> getWaypoints() {
+        return Collections.unmodifiableCollection(privateWaypoints);
+    }
+
+    /**
+     * Add a new waypoint
+     * @param waypoint The new waypoint
+     * @since 12156
+     */
+    public void addWaypoint(WayPoint waypoint) {
+        if (privateWaypoints.stream().anyMatch(w -> w == waypoint)) {
+            throw new IllegalArgumentException(MessageFormat.format("The route was already added to this data: {0}", waypoint));
+        }
+        privateWaypoints.add(waypoint);
+        fireInvalidate();
+    }
+
+    /**
+     * Remove a waypoint
+     * @param waypoint The old waypoint
+     * @since 12156
+     */
+    public void removeWaypoint(WayPoint waypoint) {
+        if (!privateWaypoints.removeIf(w -> w == waypoint)) {
+            throw new IllegalArgumentException(MessageFormat.format("The route was not in this data: {0}", waypoint));
+        }
+        fireInvalidate();
     }
 
     /**
@@ -82,13 +239,19 @@ public class GpxData extends WithAttributes implements Data {
      * @return {@code true} if this GPX data has track points, {@code false} otherwise
      */
     public boolean hasTrackPoints() {
-        for (GpxTrack trk : tracks) {
-            for (GpxTrackSegment trkseg : trk.getSegments()) {
-                if (!trkseg.getWayPoints().isEmpty())
-                    return true;
-            }
-        }
-        return false;
+        return getTrackPoints().findAny().isPresent();
+    }
+
+    /**
+     * Gets a stream of all track points in the segments of the tracks of this data.
+     * @return The stream
+     * @see #getTracks()
+     * @see GpxTrack#getSegments()
+     * @see GpxTrackSegment#getWayPoints()
+     * @since 12156
+     */
+    public Stream<WayPoint> getTrackPoints() {
+        return getTracks().stream().flatMap(trk -> trk.getSegments().stream()).flatMap(trkseg -> trkseg.getWayPoints().stream());
     }
 
     /**
@@ -96,11 +259,7 @@ public class GpxData extends WithAttributes implements Data {
      * @return {@code true} if this GPX data has route points, {@code false} otherwise
      */
     public boolean hasRoutePoints() {
-        for (GpxRoute rte : routes) {
-            if (!rte.routePoints.isEmpty())
-                return true;
-        }
-        return false;
+        return getRoutes().stream().anyMatch(rte -> !rte.routePoints.isEmpty());
     }
 
     /**
@@ -143,14 +302,14 @@ public class GpxData extends WithAttributes implements Data {
      */
     public Bounds recalculateBounds() {
         Bounds bounds = null;
-        for (WayPoint wpt : waypoints) {
+        for (WayPoint wpt : getWaypoints()) {
             if (bounds == null) {
                 bounds = new Bounds(wpt.getCoor());
             } else {
                 bounds.extend(wpt.getCoor());
             }
         }
-        for (GpxRoute rte : routes) {
+        for (GpxRoute rte : getRoutes()) {
             for (WayPoint wpt : rte.routePoints) {
                 if (bounds == null) {
                     bounds = new Bounds(wpt.getCoor());
@@ -159,7 +318,7 @@ public class GpxData extends WithAttributes implements Data {
                 }
             }
         }
-        for (GpxTrack trk : tracks) {
+        for (GpxTrack trk : getTracks()) {
             Bounds trkBounds = trk.getBounds();
             if (trkBounds != null) {
                 if (bounds == null) {
@@ -177,13 +336,7 @@ public class GpxData extends WithAttributes implements Data {
      * @return the length in meters
      */
     public double length() {
-        double result = 0.0; // in meters
-
-        for (GpxTrack trk : tracks) {
-            result += trk.length();
-        }
-
-        return result;
+        return getTracks().stream().mapToDouble(GpxTrack::length).sum();
     }
 
     /**
@@ -260,9 +413,7 @@ public class GpxData extends WithAttributes implements Data {
         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 (GpxTrack track : getTracks()) {
             for (GpxTrackSegment seg : track.getSegments()) {
                 WayPoint r = null;
                 for (WayPoint S : seg.getWayPoints()) {
@@ -351,28 +502,14 @@ public class GpxData extends WithAttributes implements Data {
      * Resets the internal caches of east/north coordinates.
      */
     public void resetEastNorthCache() {
-        if (waypoints != null) {
-            for (WayPoint wp : waypoints) {
-                wp.invalidateEastNorthCache();
+        getWaypoints().forEach(WayPoint::invalidateEastNorthCache);
+        getTrackPoints().forEach(WayPoint::invalidateEastNorthCache);
+        for (GpxRoute route: getRoutes()) {
+            if (route.routePoints == null) {
+                continue;
             }
-        }
-        if (tracks != null) {
-            for (GpxTrack track: tracks) {
-                for (GpxTrackSegment segment: track.getSegments()) {
-                    for (WayPoint wp: segment.getWayPoints()) {
-                        wp.invalidateEastNorthCache();
-                    }
-                }
-            }
-        }
-        if (routes != null) {
-            for (GpxRoute route: routes) {
-                if (route.routePoints == null) {
-                    continue;
-                }
-                for (WayPoint wp: route.routePoints) {
-                    wp.invalidateEastNorthCache();
-                }
+            for (WayPoint wp: route.routePoints) {
+                wp.invalidateEastNorthCache();
             }
         }
     }
@@ -460,9 +597,9 @@ public class GpxData extends WithAttributes implements Data {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((dataSources == null) ? 0 : dataSources.hashCode());
-        result = prime * result + ((routes == null) ? 0 : routes.hashCode());
-        result = prime * result + ((tracks == null) ? 0 : tracks.hashCode());
-        result = prime * result + ((waypoints == null) ? 0 : waypoints.hashCode());
+        result = prime * result + ((privateRoutes == null) ? 0 : privateRoutes.hashCode());
+        result = prime * result + ((privateTracks == null) ? 0 : privateTracks.hashCode());
+        result = prime * result + ((privateWaypoints == null) ? 0 : privateWaypoints.hashCode());
         return result;
     }
 
@@ -480,21 +617,88 @@ public class GpxData extends WithAttributes implements Data {
                 return false;
         } else if (!dataSources.equals(other.dataSources))
             return false;
-        if (routes == null) {
-            if (other.routes != null)
+        if (privateRoutes == null) {
+            if (other.privateRoutes != null)
                 return false;
-        } else if (!routes.equals(other.routes))
+        } else if (!privateRoutes.equals(other.privateRoutes))
             return false;
-        if (tracks == null) {
-            if (other.tracks != null)
+        if (privateTracks == null) {
+            if (other.privateTracks != null)
                 return false;
-        } else if (!tracks.equals(other.tracks))
+        } else if (!privateTracks.equals(other.privateTracks))
             return false;
-        if (waypoints == null) {
-            if (other.waypoints != null)
+        if (privateWaypoints == null) {
+            if (other.privateWaypoints != null)
                 return false;
-        } else if (!waypoints.equals(other.waypoints))
+        } else if (!privateWaypoints.equals(other.privateWaypoints))
             return false;
         return true;
     }
+
+    /**
+     * Adds a listener that gets called whenever the data changed.
+     * @param listener The listener
+     * @since 12156
+     */
+    public void addChangeListener(GpxDataChangeListener listener) {
+        listeners.addListener(listener);
+    }
+
+    /**
+     * Adds a listener that gets called whenever the data changed. It is added with a weak link
+     * @param listener The listener
+     */
+    public void addWeakChangeListener(GpxDataChangeListener listener) {
+        listeners.addWeakListener(listener);
+    }
+
+    /**
+     * Removes a listener that gets called whenever the data changed.
+     * @param listener The listener
+     * @since 12156
+     */
+    public void removeChangeListener(GpxDataChangeListener listener) {
+        listeners.removeListener(listener);
+    }
+
+    private void fireInvalidate() {
+        GpxDataChangeEvent e = new GpxDataChangeEvent(this);
+        listeners.fireEvent(l -> l.gpxDataChanged(e));
+    }
+
+    /**
+     * A listener that listens to GPX data changes.
+     * @author Michael Zangl
+     * @since 12156
+     */
+    @FunctionalInterface
+    public interface GpxDataChangeListener {
+        /**
+         * Called when the gpx data changed.
+         * @param e The event
+         */
+        void gpxDataChanged(GpxDataChangeEvent e);
+    }
+
+    /**
+     * A data change event in any of the gpx data.
+     * @author Michael Zangl
+     * @since 12156
+     */
+    public static class GpxDataChangeEvent {
+        private final GpxData source;
+
+        GpxDataChangeEvent(GpxData source) {
+            super();
+            this.source = source;
+        }
+
+        /**
+         * Get the data that was changed.
+         * @return The data.
+         */
+        public GpxData getSource() {
+            return source;
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxRoute.java b/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
index 2ed9f73..543f059 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
@@ -4,7 +4,15 @@ package org.openstreetmap.josm.data.gpx;
 import java.util.Collection;
 import java.util.LinkedList;
 
+/**
+ * A route is a part of a GPX file containing of multiple GPX points.
+ */
 public class GpxRoute extends WithAttributes {
+    /**
+     * The points this route consists of. Should not be changed after creation.
+     * <p>
+     * This collection is ordered.
+     */
     public Collection<WayPoint> routePoints = new LinkedList<>();
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxTrack.java b/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
index 34d44fa..c299d2f 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
@@ -39,6 +39,63 @@ public interface GpxTrack extends IWithAttributes {
     /**
      * Returns the number of times this track has been changed.
      * @return Number of times this track has been changed. Always 0 for read-only tracks
+     * @deprecated since 12156 Replaced by change listeners.
      */
-    int getUpdateCount();
+    @Deprecated
+    default int getUpdateCount() {
+        // to allow removal
+        return 0;
+    }
+
+    /**
+     * Add a listener that listens to changes in the GPX track.
+     * @param l The listener
+     */
+    default void addListener(GpxTrackChangeListener l) {
+        // nop
+    }
+
+    /**
+     * Remove a listener that listens to changes in the GPX track.
+     * @param l The listener
+     */
+    default void removeListener(GpxTrackChangeListener l) {
+        // nop
+    }
+
+    /**
+     * A listener that listens to GPX track changes.
+     * @author Michael Zangl
+     * @since 12156
+     */
+    @FunctionalInterface
+    interface GpxTrackChangeListener {
+        /**
+         * Called when the gpx data changed.
+         * @param e The event
+         */
+        void gpxDataChanged(GpxTrackChangeEvent e);
+    }
+
+    /**
+     * A track change event for the current track.
+     * @author Michael Zangl
+     * @since 12156
+     */
+    class GpxTrackChangeEvent {
+        private final GpxTrack source;
+
+        GpxTrackChangeEvent(GpxTrack source) {
+            super();
+            this.source = source;
+        }
+
+        /**
+         * Get the track that was changed.
+         * @return The track.
+         */
+        public GpxTrack getSource() {
+            return source;
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java b/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
index ba338ea..ee0d7a2 100644
--- a/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
+++ b/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
@@ -8,6 +8,9 @@ import java.util.List;
 
 import org.openstreetmap.josm.data.Bounds;
 
+/**
+ * A gpx track segment consisting of multiple waypoints, that cannot be changed.
+ */
 public class ImmutableGpxTrackSegment implements GpxTrackSegment {
 
     private final List<WayPoint> wayPoints;
@@ -58,7 +61,7 @@ public class ImmutableGpxTrackSegment implements GpxTrackSegment {
 
     @Override
     public Collection<WayPoint> getWayPoints() {
-        return wayPoints;
+        return Collections.unmodifiableList(wayPoints);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/gpx/WayPoint.java b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
index 54f1abf..bd08067 100644
--- a/src/org/openstreetmap/josm/data/gpx/WayPoint.java
+++ b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
@@ -5,24 +5,40 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
 
-public class WayPoint extends WithAttributes implements Comparable<WayPoint>, TemplateEngineDataProvider {
+/**
+ * A point in the GPX data
+ * @since 12167 implements ILatLon
+ */
+public class WayPoint extends WithAttributes implements Comparable<WayPoint>, TemplateEngineDataProvider, ILatLon {
 
     /**
      * The seconds (not milliseconds!) since 1970-01-01 00:00 UTC
      */
     public double time;
+    /**
+     * The color to draw the segment before this point in
+     * @see #drawLine
+     */
     public Color customColoring;
+    /**
+     * <code>true</code> indicates that the line before this point should be drawn
+     */
     public boolean drawLine;
+    /**
+     * The direction of the line before this point. Used as cache to speed up drawing. Should not be relied on.
+     */
     public int dir;
 
     /**
@@ -35,6 +51,7 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
         lon = p.lon;
         east = p.east;
         north = p.north;
+        eastNorthCacheKey = p.eastNorthCacheKey;
         time = p.time;
         customColoring = p.customColoring;
         drawLine = p.drawLine;
@@ -62,6 +79,7 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
      */
     private double east = Double.NaN;
     private double north = Double.NaN;
+    private Object eastNorthCacheKey;
 
     /**
      * Invalidate the internal cache of east/north coordinates.
@@ -79,25 +97,26 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
         return new LatLon(lat, lon);
     }
 
-    /**
-     * <p>Replies the projected east/north coordinates.</p>
-     *
-     * <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
-     * Internally caches the projected coordinates.</p>
-     *
-     * <p><strong>Caveat:</strong> doesn't listen to projection changes. Clients must
-     * {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
-     *
-     * @return the east north coordinates or {@code null}
-     * @see #invalidateEastNorthCache()
-     */
-    public final EastNorth getEastNorth() {
-        if (Double.isNaN(east) || Double.isNaN(north)) {
+    @Override
+    public double lon() {
+        return lon;
+    }
+
+    @Override
+    public double lat() {
+        return lat;
+    }
+
+    @Override
+    public final EastNorth getEastNorth(Projecting projecting) {
+        Object newCacheKey = projecting.getCacheKey();
+        if (Double.isNaN(east) || Double.isNaN(north) || !Objects.equals(newCacheKey, this.eastNorthCacheKey)) {
             // projected coordinates haven't been calculated yet,
             // so fill the cache of the projected waypoint coordinates
-            EastNorth en = Projections.project(new LatLon(lat, lon));
+            EastNorth en = projecting.latlon2eastNorth(this);
             this.east = en.east();
             this.north = en.north();
+            this.eastNorthCacheKey = newCacheKey;
         }
         return new EastNorth(east, north);
     }
diff --git a/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
index 5efdfcd..f61eeb4 100644
--- a/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
+++ b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.imagery;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
@@ -77,7 +78,7 @@ public final class GetCapabilitiesParseHelper {
      * @throws XMLStreamException if any XML stream error occurs
      */
     public static XMLStreamReader getReader(InputStream in) throws XMLStreamException {
-        XMLInputFactory factory = XMLInputFactory.newFactory();
+        XMLInputFactory factory = XMLInputFactory.newInstance();
         // do not try to load external entities, nor validate the XML
         factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
         factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
@@ -201,10 +202,12 @@ public final class GetCapabilitiesParseHelper {
      * Convert CRS identifier to plain code
      * @param crsIdentifier CRS identifier
      * @return CRS Identifier as it is used within JOSM (without prefix)
+     * @see <a href="https://portal.opengeospatial.org/files/?artifact_id=24045">
+     *     Definition identifier URNs in OGC namespace, chapter 7.2: URNs for single objects</a>
      */
     public static String crsToCode(String crsIdentifier) {
         if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
-            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
+            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*)(?::.*)?:(.*)$", "$1:$2").toUpperCase(Locale.ENGLISH);
         }
         return crsIdentifier;
     }
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 0d009cf..f68284c 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -626,7 +626,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
 
     @Override
     public boolean requiresAttribution() {
-        return attributionText != null || attributionImage != null || termsOfUseText != null || termsOfUseURL != null;
+        return attributionText != null || attributionLinkURL != null || attributionImage != null
+                || termsOfUseText != null || termsOfUseURL != null;
     }
 
     @Override
@@ -658,6 +659,15 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
         return null;
     }
 
+    /**
+     * Return the raw attribution logo information (an URL to the image).
+     * @return The url text
+     * @since 12257
+     */
+    public String getAttributionImageRaw() {
+        return attributionImage;
+    }
+
     @Override
     public String getAttributionImageURL() {
         return attributionImageURL;
diff --git a/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java b/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
index ca58643..f04e6fa 100644
--- a/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
+++ b/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
@@ -6,79 +6,174 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.Preferences.pref;
+import org.openstreetmap.josm.data.Preferences.writeExplicitly;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 
+/**
+ * Class to save a displacement of background imagery as a bookmark.
+ *
+ * Known offset bookmarks will be stored in the preferences and can be
+ * restored by the user in later sessions.
+ */
 public class OffsetBookmark {
     private static final List<OffsetBookmark> allBookmarks = new ArrayList<>();
 
-    public String projectionCode;
-    public String layerName;
-    public String name;
-    public double dx, dy;
-    public double centerX, centerY;
+    @pref private String projection_code;
+    @pref private String imagery_name;
+    @pref private String name;
+    @pref @writeExplicitly private double dx, dy;
+    @pref private double center_lon, center_lat;
 
     public boolean isUsable(ImageryLayer layer) {
-        if (projectionCode == null) return false;
-        if (!Main.getProjection().toCode().equals(projectionCode)) return false;
-        return layer.getInfo().getName().equals(layerName);
+        if (projection_code == null) return false;
+        if (!Main.getProjection().toCode().equals(projection_code) && !hasCenter()) return false;
+        return layer.getInfo().getName().equals(imagery_name);
     }
 
-    public OffsetBookmark(String projectionCode, String layerName, String name, double dx, double dy) {
-        this(projectionCode, layerName, name, dx, dy, 0, 0);
+    /**
+     * Construct new empty OffsetBookmark.
+     *
+     * Only used for preferences handling.
+     */
+    public OffsetBookmark() {
+        // do nothing
+    }
+
+    public OffsetBookmark(String projectionCode, String imageryName, String name, double dx, double dy) {
+        this(projectionCode, imageryName, name, dx, dy, 0, 0);
     }
 
-    public OffsetBookmark(String projectionCode, String layerName, String name, double dx, double dy, double centerX, double centerY) {
-        this.projectionCode = projectionCode;
-        this.layerName = layerName;
+    public OffsetBookmark(String projectionCode, String imageryName, String name, double dx, double dy, double centerLon, double centerLat) {
+        this.projection_code = projectionCode;
+        this.imagery_name = imageryName;
         this.name = name;
         this.dx = dx;
         this.dy = dy;
-        this.centerX = centerX;
-        this.centerY = centerY;
+        this.center_lon = centerLon;
+        this.center_lat = centerLat;
     }
 
     public OffsetBookmark(Collection<String> list) {
         List<String> array = new ArrayList<>(list);
-        this.projectionCode = array.get(0);
-        this.layerName = array.get(1);
+        this.projection_code = array.get(0);
+        this.imagery_name = array.get(1);
         this.name = array.get(2);
         this.dx = Double.parseDouble(array.get(3));
         this.dy = Double.parseDouble(array.get(4));
         if (array.size() >= 7) {
-            this.centerX = Double.parseDouble(array.get(5));
-            this.centerY = Double.parseDouble(array.get(6));
+            this.center_lon = Double.parseDouble(array.get(5));
+            this.center_lat = Double.parseDouble(array.get(6));
         }
-        if (projectionCode == null) {
-            Main.error(tr("Projection ''{0}'' is not found, bookmark ''{1}'' is not usable", projectionCode, name));
+        if (projection_code == null) {
+            Main.error(tr("Projection ''{0}'' is not found, bookmark ''{1}'' is not usable", projection_code, name));
         }
     }
 
-    public List<String> getInfoArray() {
-        List<String> res = new ArrayList<>(7);
-        if (projectionCode != null) {
-            res.add(projectionCode);
-        } else {
-            res.add("");
-        }
-        res.add(layerName);
-        res.add(name);
-        res.add(String.valueOf(dx));
-        res.add(String.valueOf(dy));
-        if (centerX != 0 || centerY != 0) {
-            res.add(String.valueOf(centerX));
-            res.add(String.valueOf(centerY));
+    public String getProjectionCode() {
+        return projection_code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImageryName() {
+        return imagery_name;
+    }
+
+    /**
+     * Get displacement in EastNorth coordinates of the original projection.
+     *
+     * @return the displacement
+     * @see #getProjectionCode()
+     */
+    public EastNorth getDisplacement() {
+        return new EastNorth(dx, dy);
+    }
+
+    /**
+     * Get displacement in EastNorth coordinates of a given projection.
+     *
+     * Displacement will be converted to the given projection, with respect to the
+     * center (reference point) of this bookmark.
+     * @param proj the projection
+     * @return the displacement, converted to that projection
+     */
+    public EastNorth getDisplacement(Projection proj) {
+        if (proj.toCode().equals(projection_code)) {
+            return getDisplacement();
         }
-        return res;
+        LatLon center = getCenter();
+        Projection offsetProj = Projections.getProjectionByCode(projection_code);
+        EastNorth centerEN = center.getEastNorth(offsetProj);
+        EastNorth shiftedEN = centerEN.add(getDisplacement());
+        LatLon shifted = offsetProj.eastNorth2latlon(shiftedEN);
+        EastNorth centerEN2 = center.getEastNorth(proj);
+        EastNorth shiftedEN2 = shifted.getEastNorth(proj);
+        return shiftedEN2.subtract(centerEN2);
+    }
+
+    /**
+     * Get center/reference point of the bookmark.
+     *
+     * Basically this is the place where it was created and is valid.
+     * The center may be unrecorded (see {@link #hasCenter()}, in which
+     * case a dummy center (0,0) will be returned.
+     * @return the center
+     */
+    public LatLon getCenter() {
+        return new LatLon(center_lat, center_lon);
+    }
+
+    /**
+     * Check if bookmark has a valid center.
+     * @return true if bookmark has a valid center
+     */
+    public boolean hasCenter() {
+        return center_lat != 0 || center_lon != 0;
+    }
+
+    public void setProjectionCode(String projectionCode) {
+        this.projection_code = projectionCode;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setImageryName(String imageryName) {
+        this.imagery_name = imageryName;
+    }
+
+    public void setDisplacement(EastNorth displacement) {
+        this.dx = displacement.east();
+        this.dy = displacement.north();
     }
 
     public static void loadBookmarks() {
+        List<OffsetBookmark> bookmarks = Main.pref.getListOfStructs("imagery.offsetbookmarks", null, OffsetBookmark.class);
+        if (bookmarks == null) {
+            loadBookmarksOld();
+            saveBookmarks();
+        } else {
+            allBookmarks.addAll(bookmarks);
+        }
+    }
+
+    // migration code - remove Nov. 2017
+    private static void loadBookmarksOld() {
         for (Collection<String> c : Main.pref.getArray("imagery.offsets",
                 Collections.<Collection<String>>emptySet())) {
             allBookmarks.add(new OffsetBookmark(c));
@@ -86,11 +181,7 @@ public class OffsetBookmark {
     }
 
     public static void saveBookmarks() {
-        List<Collection<String>> coll = new LinkedList<>();
-        for (OffsetBookmark b : allBookmarks) {
-            coll.add(b.getInfoArray());
-        }
-        Main.pref.putArray("imagery.offsets", coll);
+        Main.pref.putListOfStructs("imagery.offsetbookmarks", allBookmarks, OffsetBookmark.class);
     }
 
     /**
@@ -172,4 +263,27 @@ public class OffsetBookmark {
         allBookmarks.add(nb);
         saveBookmarks();
     }
+
+    /**
+     * Converts the offset bookmark to a properties map.
+     *
+     * The map contains all the information to restore the offset bookmark.
+     * @return properties map of all data
+     * @see #fromPropertiesMap(java.util.Map)
+     * @since 12134
+     */
+    public Map<String, String> toPropertiesMap() {
+        return Preferences.serializeStruct(this, OffsetBookmark.class);
+    }
+
+    /**
+     * Creates an offset bookmark from a properties map.
+     * @param properties the properties map
+     * @return corresponding offset bookmark
+     * @see #toPropertiesMap()
+     * @since 12134
+     */
+    public static OffsetBookmark fromPropertiesMap(Map<String, String> properties) {
+        return Preferences.deserializeStruct(properties, OffsetBookmark.class);
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index 39739d5..351eb39 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -73,6 +73,8 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final QName QN_CONTENTS            = new QName(WMTSTileSource.WMTS_NS_URL, "Contents");
+    private static final QName QN_DEFAULT             = new QName(WMTSTileSource.WMTS_NS_URL, "Default");
+    private static final QName QN_DIMENSION           = new QName(WMTSTileSource.WMTS_NS_URL, "Dimension");
     private static final QName QN_FORMAT              = new QName(WMTSTileSource.WMTS_NS_URL, "Format");
     private static final QName QN_LAYER               = new QName(WMTSTileSource.WMTS_NS_URL, "Layer");
     private static final QName QN_MATRIX_WIDTH        = new QName(WMTSTileSource.WMTS_NS_URL, "MatrixWidth");
@@ -86,6 +88,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     private static final QName QN_TILE_WIDTH          = new QName(WMTSTileSource.WMTS_NS_URL, "TileWidth");
     private static final QName QN_TILE_HEIGHT         = new QName(WMTSTileSource.WMTS_NS_URL, "TileHeight");
     private static final QName QN_TOPLEFT_CORNER      = new QName(WMTSTileSource.WMTS_NS_URL, "TopLeftCorner");
+    private static final QName QN_VALUE               = new QName(WMTSTileSource.WMTS_NS_URL, "Value");
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
     private static final String PATTERN_HEADER = "\\{header\\(([^,]+),([^}]+)\\)\\}";
@@ -141,7 +144,12 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
             crs = builder.crs;
             identifier = builder.identifier;
         }
+    }
 
+    private static class Dimension {
+        private String identifier;
+        private String defaultValue;
+        private final List<String> values = new ArrayList<>();
     }
 
     private static class Layer {
@@ -152,6 +160,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         private String baseUrl;
         private String style;
         private final Collection<String> tileMatrixSetLinks = new ArrayList<>();
+        private final Collection<Dimension> dimensions = new ArrayList<>();
 
         Layer(Layer l) {
             Objects.requireNonNull(l);
@@ -161,6 +170,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
             baseUrl = l.baseUrl;
             style = l.style;
             tileMatrixSet = new TileMatrixSet(l.tileMatrixSet);
+            dimensions.addAll(l.dimensions);
         }
 
         Layer() {
@@ -457,8 +467,10 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
                             layer.style = reader.getElementText();
                             tagStack.push(reader.getName()); // keep tagStack in sync
                         }
+                    } else if (QN_DIMENSION.equals(reader.getName())) {
+                        layer.dimensions.add(parseDimension(reader));
                     } else if (QN_TILEMATRIX_SET_LINK.equals(reader.getName())) {
-                        layer.tileMatrixSetLinks.add(praseTileMatrixSetLink(reader));
+                        layer.tileMatrixSetLinks.add(parseTileMatrixSetLink(reader));
                     } else {
                         GetCapabilitiesParseHelper.moveReaderToEndCurrentTag(reader);
                     }
@@ -487,13 +499,39 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
     }
 
     /**
+     * Gets Dimension value. Returns when reader is on Dimension closing tag
+     *
+     * @param reader StAX reader instance
+     * @return dimension
+     * @throws XMLStreamException See {@link XMLStreamReader}
+     */
+    private static Dimension parseDimension(XMLStreamReader reader) throws XMLStreamException {
+        Dimension ret = new Dimension();
+        for (int event = reader.getEventType();
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT &&
+                        QN_DIMENSION.equals(reader.getName()));
+                event = reader.next()) {
+            if (event == XMLStreamReader.START_ELEMENT) {
+                if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
+                    ret.identifier = reader.getElementText();
+                } else if (QN_DEFAULT.equals(reader.getName())) {
+                    ret.defaultValue = reader.getElementText();
+                } else if (QN_VALUE.equals(reader.getName())) {
+                    ret.values.add(reader.getElementText());
+                }
+            }
+        }
+        return ret;
+    }
+
+    /**
      * Gets TileMatrixSetLink value. Returns when reader is on TileMatrixSetLink closing tag
      *
      * @param reader StAX reader instance
      * @return TileMatrixSetLink identifier
      * @throws XMLStreamException See {@link XMLStreamReader}
      */
-    private static String praseTileMatrixSetLink(XMLStreamReader reader) throws XMLStreamException {
+    private static String parseTileMatrixSetLink(XMLStreamReader reader) throws XMLStreamException {
         String ret = null;
         for (int event = reader.getEventType();
                 reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT &&
@@ -717,13 +755,19 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
             return ""; // no matrix, probably unsupported CRS selected.
         }
 
-        return url.replaceAll("\\{layer\\}", this.currentLayer.identifier)
+        url = url.replaceAll("\\{layer\\}", this.currentLayer.identifier)
                 .replaceAll("\\{format\\}", this.currentLayer.format)
                 .replaceAll("\\{TileMatrixSet\\}", this.currentTileMatrixSet.identifier)
                 .replaceAll("\\{TileMatrix\\}", tileMatrix.identifier)
                 .replaceAll("\\{TileRow\\}", Integer.toString(tiley))
                 .replaceAll("\\{TileCol\\}", Integer.toString(tilex))
                 .replaceAll("(?i)\\{style\\}", this.currentLayer.style);
+
+        for (Dimension d : currentLayer.dimensions) {
+            url = url.replaceAll("\\{"+d.identifier+"\\}", d.defaultValue);
+        }
+
+        return url;
     }
 
     /**
@@ -934,6 +978,10 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         return nativeScaleList;
     }
 
+    /**
+     * Returns the tile projection.
+     * @return the tile projection
+     */
     public Projection getTileProjection() {
         return tileProjection;
     }
diff --git a/src/org/openstreetmap/josm/data/oauth/OAuthToken.java b/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
index 7d5a02f..92e427d 100644
--- a/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
+++ b/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
@@ -7,6 +7,9 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 import oauth.signpost.OAuthConsumer;
 
+/**
+ * An oauth token that has been obtained by JOSM and can be used to authenticate the user on the server.
+ */
 public class OAuthToken {
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index 6b487b1..79453c8 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -306,6 +306,10 @@ public abstract class AbstractPrimitive implements IPrimitive {
         return new SimplePrimitiveId(getUniqueId(), getType());
     }
 
+    /**
+     * Gets the type this primitive is displayed at
+     * @return A {@link OsmPrimitiveType}
+     */
     public OsmPrimitiveType getDisplayType() {
         return getType();
     }
@@ -668,6 +672,11 @@ public abstract class AbstractPrimitive implements IPrimitive {
         return OsmUtils.isFalse(get(key));
     }
 
+    /**
+     * Gets a key ignoring the case of the key
+     * @param key The key to get
+     * @return The value for a key that matches the given key ignoring case.
+     */
     public final String getIgnoreCase(String key) {
         String[] keys = this.keys;
         if (key == null)
@@ -680,6 +689,10 @@ public abstract class AbstractPrimitive implements IPrimitive {
         return null;
     }
 
+    /**
+     * Gets the number of keys
+     * @return The number of keys set for this primitive.
+     */
     public final int getNumKeys() {
         String[] keys = this.keys;
         return keys == null ? 0 : keys.length / 2;
diff --git a/src/org/openstreetmap/josm/data/osm/BBox.java b/src/org/openstreetmap/josm/data/osm/BBox.java
index 54e24d5..8cd4b21 100644
--- a/src/org/openstreetmap/josm/data/osm/BBox.java
+++ b/src/org/openstreetmap/josm/data/osm/BBox.java
@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.Objects;
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.QuadTiling;
 import org.openstreetmap.josm.tools.Utils;
@@ -84,7 +85,7 @@ public class BBox {
      * @param w the way
      */
     public BBox(Way w) {
-        w.getNodes().forEach(n -> add(n.getCoor()));
+        w.getNodes().forEach(this::add);
     }
 
     /**
@@ -92,18 +93,35 @@ public class BBox {
      * @param n the node
      */
     public BBox(Node n) {
-        if (n.isLatLonKnown()) {
-            add(n.getCoor());
-        }
+        this((ILatLon) n);
+    }
+
+    /**
+     * Create BBox for a given latlon. An invalid BBox is returned if the coordinates are not known.
+     * @param ll The lat lon position
+     */
+    public BBox(ILatLon ll) {
+        add(ll);
     }
 
     /**
      * Add a point to an existing BBox. Extends this bbox if necessary so that this.bounds(c) will return true
      * if c is a valid LatLon instance.
+     * Kept for binary compatibility
      * @param c a LatLon point
      */
     public final void add(LatLon c) {
-        if (c != null && c.isValid()) {
+        add((ILatLon) c);
+    }
+
+    /**
+     * Add a point to an existing BBox. Extends this bbox if necessary so that this.bounds(c) will return true
+     * if c is a valid LatLon instance.
+     * If it is invalid or <code>null</code>, this call is ignored.
+     * @param c a LatLon point.
+     */
+    public final void add(ILatLon c) {
+        if (c != null) {
             add(c.lon(), c.lat());
         }
     }
@@ -280,6 +298,10 @@ public class BBox {
         return idx1;
     }
 
+    /**
+     * Converts the bounds to a rectangle
+     * @return The rectangle in east/north space.
+     */
     public Rectangle2D toRectangle() {
         return new Rectangle2D.Double(xmin, ymin, xmax - xmin, ymax - ymin);
     }
@@ -320,6 +342,11 @@ public class BBox {
         return "[ x: " + xmin + " -> " + xmax + ", y: " + ymin + " -> " + ymax + " ]";
     }
 
+    /**
+     * Creates a CSV string for this bbox
+     * @param separator The separator to use
+     * @return A string
+     */
     public String toStringCSV(String separator) {
         return Utils.join(separator, Arrays.asList(
                 LatLon.cDdFormatter.format(xmin),
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java b/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java
index 6ddbe95..f28468b 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java
@@ -3,12 +3,31 @@ package org.openstreetmap.josm.data.osm;
 
 import java.util.Collection;
 
+/**
+ * An event indicating a change in the {@link ChangesetCache}
+ */
 public interface ChangesetCacheEvent {
+    /**
+     * The changeset cache the change happened in.
+     * @return The {@link ChangesetCache}
+     */
     ChangesetCache getSource();
 
+    /**
+     * Gets a list of {@link Changeset}s that were added to the cache
+     * @return The changesets
+     */
     Collection<Changeset> getAddedChangesets();
 
+    /**
+     * Gets a list of {@link Changeset}s that were removed from the cache
+     * @return The changesets
+     */
     Collection<Changeset> getRemovedChangesets();
 
+    /**
+     * Gets a list of {@link Changeset}s that were changed
+     * @return The changesets
+     */
     Collection<Changeset> getUpdatedChangesets();
 }
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java b/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java
index 3a1f508..5c953ca 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java
@@ -1,8 +1,16 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
 
+/**
+ * A listener that listens to changes on the {@link ChangesetCache}
+ * @see ChangesetCacheEvent
+ */
 @FunctionalInterface
 public interface ChangesetCacheListener {
 
+    /**
+     * Gets notified on changeset cache updates
+     * @param event The event that happened
+     */
     void changesetCacheUpdated(ChangesetCacheEvent event);
 }
diff --git a/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java b/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
new file mode 100644
index 0000000..4ecd04e
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
@@ -0,0 +1,301 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+/**
+ * This is a listener that listens to selection change events in the data set.
+ * @author Michael Zangl
+ * @since 12048
+ */
+ at FunctionalInterface
+public interface DataSelectionListener {
+
+    /**
+     * Called whenever the selection is changed.
+     *
+     * You get notified about the new selection, the elements that were added and removed and the layer that triggered the event.
+     * @param event The selection change event.
+     * @see SelectionChangeEvent
+     */
+    void selectionChanged(SelectionChangeEvent event);
+
+    /**
+     * The event that is fired when the selection changed.
+     * @author Michael Zangl
+     * @since 12048
+     */
+    interface SelectionChangeEvent {
+        /**
+         * Gets the previous selection
+         * <p>
+         * This collection cannot be modified and will not change.
+         * @return The old selection
+         */
+        Set<OsmPrimitive> getOldSelection();
+
+        /**
+         * Gets the new selection. New elements are added to the end of the collection.
+         * <p>
+         * This collection cannot be modified and will not change.
+         * @return The new selection
+         */
+        Set<OsmPrimitive> getSelection();
+
+        /**
+         * Gets the primitives that have been removed from the selection.
+         * <p>
+         * Those are the primitives contained in {@link #getOldSelection()} but not in {@link #getSelection()}
+         * <p>
+         * This collection cannot be modified and will not change.
+         * @return The primitives that were removed
+         */
+        Set<OsmPrimitive> getRemoved();
+
+        /**
+         * Gets the primitives that have been added to the selection.
+         * <p>
+         * Those are the primitives contained in {@link #getSelection()} but not in {@link #getOldSelection()}
+         * <p>
+         * This collection cannot be modified and will not change.
+         * @return The primitives that were added
+         */
+        Set<OsmPrimitive> getAdded();
+
+        /**
+         * Gets the data set that triggered this selection event.
+         * @return The data set.
+         */
+        DataSet getSource();
+
+        /**
+         * Test if this event did not change anything.
+         * <p>
+         * This will return <code>false</code> for all events that are sent to listeners, so you don't need to test it.
+         * @return <code>true</code> if this did not change the selection.
+         */
+        default boolean isNop() {
+            return getAdded().isEmpty() && getRemoved().isEmpty();
+        }
+    }
+
+    /**
+     * The base class for selection events
+     * @author Michael Zangl
+     * @since 12048
+     */
+    abstract class AbstractSelectionEvent implements SelectionChangeEvent {
+        private final DataSet source;
+        private final Set<OsmPrimitive> old;
+
+        public AbstractSelectionEvent(DataSet source, Set<OsmPrimitive> old) {
+            CheckParameterUtil.ensureParameterNotNull(source, "source");
+            CheckParameterUtil.ensureParameterNotNull(old, "old");
+            this.source = source;
+            this.old = Collections.unmodifiableSet(old);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getOldSelection() {
+            return old;
+        }
+
+        @Override
+        public DataSet getSource() {
+            return source;
+        }
+    }
+
+
+    /**
+     * The selection is replaced by a new selection
+     * @author Michael Zangl
+     * @since 12048
+     */
+    class SelectionReplaceEvent extends AbstractSelectionEvent {
+        private final Set<OsmPrimitive> current;
+        private Set<OsmPrimitive> removed;
+        private Set<OsmPrimitive> added;
+
+        /**
+         * Create a {@link SelectionReplaceEvent}
+         * @param source The source dataset
+         * @param old The old primitves that were previously selected. The caller needs to ensure that this set is not modifed.
+         * @param newSelection The primitives of the new selection.
+         */
+        public SelectionReplaceEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> newSelection) {
+            super(source, old);
+            this.current = newSelection.collect(Collectors.toCollection(LinkedHashSet::new));
+        }
+
+        @Override
+        public Set<OsmPrimitive> getSelection() {
+            return current;
+        }
+
+        @Override
+        public synchronized Set<OsmPrimitive> getRemoved() {
+            if (removed == null) {
+                removed = getOldSelection().stream()
+                        .filter(p -> !current.contains(p))
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
+            }
+            return removed;
+        }
+
+        @Override
+        public synchronized Set<OsmPrimitive> getAdded() {
+            if (added == null) {
+                added = current.stream()
+                        .filter(p -> !getOldSelection().contains(p)).collect(Collectors.toCollection(LinkedHashSet::new));
+            }
+            return added;
+        }
+    }
+
+    /**
+     * Primitives are added to the selection
+     * @author Michael Zangl
+     * @since 12048
+     */
+    class SelectionAddEvent extends AbstractSelectionEvent {
+        private final Set<OsmPrimitive> add;
+        private final Set<OsmPrimitive> current;
+
+        /**
+         * Create a {@link SelectionAddEvent}
+         * @param source The source dataset
+         * @param old The old primitves that were previously selected. The caller needs to ensure that this set is not modifed.
+         * @param toAdd The primitives to add.
+         */
+        public SelectionAddEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> toAdd) {
+            super(source, old);
+            this.add = toAdd
+                    .filter(p -> !old.contains(p))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+            if (this.add.isEmpty()) {
+                this.current = this.getOldSelection();
+            } else {
+                this.current = new LinkedHashSet<>(old);
+                this.current.addAll(add);
+            }
+        }
+
+        @Override
+        public Set<OsmPrimitive> getSelection() {
+            return Collections.unmodifiableSet(current);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getRemoved() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Set<OsmPrimitive> getAdded() {
+            return Collections.unmodifiableSet(add);
+        }
+    }
+
+    /**
+     * Primitives are removed from the selection
+     * @author Michael Zangl
+     * @since 12048
+     */
+    class SelectionRemoveEvent extends AbstractSelectionEvent {
+        private final Set<OsmPrimitive> remove;
+        private final Set<OsmPrimitive> current;
+
+        /**
+         * Create a {@link SelectionRemoveEvent}
+         * @param source The source dataset
+         * @param old The old primitves that were previously selected. The caller needs to ensure that this set is not modifed.
+         * @param toRemove The primitives to remove.
+         */
+        public SelectionRemoveEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> toRemove) {
+            super(source, old);
+            this.remove = toRemove
+                    .filter(old::contains)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+            if (this.remove.isEmpty()) {
+                this.current = this.getOldSelection();
+            } else {
+                HashSet<OsmPrimitive> currentSet = new LinkedHashSet<>(old);
+                currentSet.removeAll(remove);
+                current = Collections.unmodifiableSet(currentSet);
+            }
+        }
+
+        @Override
+        public Set<OsmPrimitive> getSelection() {
+            return Collections.unmodifiableSet(current);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getRemoved() {
+            return Collections.unmodifiableSet(remove);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getAdded() {
+            return Collections.emptySet();
+        }
+    }
+
+    /**
+     * Toggle the selected state of a primitive
+     * @author Michael Zangl
+     * @since 12048
+     */
+    class SelectionToggleEvent extends AbstractSelectionEvent {
+        private final Set<OsmPrimitive> current;
+        private final Set<OsmPrimitive> remove;
+        private final Set<OsmPrimitive> add;
+
+        /**
+         * Create a {@link SelectionToggleEvent}
+         * @param source The source dataset
+         * @param old The old primitves that were previously selected. The caller needs to ensure that this set is not modifed.
+         * @param toToggle The primitives to toggle.
+         */
+        public SelectionToggleEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> toToggle) {
+            super(source, old);
+            HashSet<OsmPrimitive> currentSet = new LinkedHashSet<>(old);
+            HashSet<OsmPrimitive> removeSet = new LinkedHashSet<>();
+            HashSet<OsmPrimitive> addSet = new LinkedHashSet<>();
+            toToggle.forEach(p -> {
+                if (currentSet.remove(p)) {
+                    removeSet.add(p);
+                } else {
+                    addSet.add(p);
+                    currentSet.add(p);
+                }
+            });
+            this.current = Collections.unmodifiableSet(currentSet);
+            this.remove = Collections.unmodifiableSet(removeSet);
+            this.add = Collections.unmodifiableSet(addSet);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getSelection() {
+            return Collections.unmodifiableSet(current);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getRemoved() {
+            return Collections.unmodifiableSet(remove);
+        }
+
+        @Override
+        public Set<OsmPrimitive> getAdded() {
+            return Collections.unmodifiableSet(add);
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 30968ac..15231fc 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -5,13 +5,11 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.geom.Area;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +19,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -32,6 +31,11 @@ import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSelectionListener.SelectionAddEvent;
+import org.openstreetmap.josm.data.osm.DataSelectionListener.SelectionChangeEvent;
+import org.openstreetmap.josm.data.osm.DataSelectionListener.SelectionRemoveEvent;
+import org.openstreetmap.josm.data.osm.DataSelectionListener.SelectionReplaceEvent;
+import org.openstreetmap.josm.data.osm.DataSelectionListener.SelectionToggleEvent;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
 import org.openstreetmap.josm.data.osm.event.ChangesetIdChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
@@ -41,6 +45,7 @@ import org.openstreetmap.josm.data.osm.event.PrimitiveFlagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
 import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -48,10 +53,8 @@ import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
-import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
  * DataSet is the data behind the application. It can consists of only a few points up to the whole
@@ -97,7 +100,7 @@ import org.openstreetmap.josm.tools.Utils;
  *
  * @author imi
  */
-public final class DataSet implements Data, ProjectionChangeListener {
+public final class DataSet extends QuadBucketPrimitiveStore implements Data, ProjectionChangeListener {
 
     /**
      * Upload policy.
@@ -166,7 +169,22 @@ public final class DataSet implements Data, ProjectionChangeListener {
     private UploadPolicy uploadPolicy;
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    /**
+     * The mutex lock that is used to synchronize selection changes.
+     */
     private final Object selectionLock = new Object();
+    /**
+     * The current selected primitives. This is always a unmodifiable set.
+     *
+     * The set should be ordered in the order in which the primitives have been added to the selection.
+     */
+    private Set<OsmPrimitive> currentSelectedPrimitives = Collections.emptySet();
+
+    /**
+     * A list of listeners that listen to selection changes on this layer.
+     */
+    private final ListenerList<DataSelectionListener> selectionListeners = ListenerList.create();
 
     private Area cachedDataSourceArea;
     private List<Bounds> cachedDataSourceBounds;
@@ -183,6 +201,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
         // Transparently register as projection change listener. No need to explicitly remove
         // the listener, projection change listeners are managed as WeakReferences.
         Main.addProjectionChangeListener(this);
+        addSelectionListener((DataSelectionListener) e -> fireDreprecatedSelectionChange(e.getSelection()));
     }
 
     /**
@@ -195,12 +214,12 @@ public final class DataSet implements Data, ProjectionChangeListener {
         copyFrom.getReadLock().lock();
         try {
             Map<OsmPrimitive, OsmPrimitive> primMap = new HashMap<>();
-            for (Node n : copyFrom.nodes) {
+            for (Node n : copyFrom.getNodes()) {
                 Node newNode = new Node(n);
                 primMap.put(n, newNode);
                 addPrimitive(newNode);
             }
-            for (Way w : copyFrom.ways) {
+            for (Way w : copyFrom.getWays()) {
                 Way newWay = new Way(w);
                 primMap.put(w, newWay);
                 List<Node> newNodes = new ArrayList<>();
@@ -212,13 +231,14 @@ public final class DataSet implements Data, ProjectionChangeListener {
             }
             // Because relations can have other relations as members we first clone all relations
             // and then get the cloned members
-            for (Relation r : copyFrom.relations) {
+            Collection<Relation> relations = copyFrom.getRelations();
+            for (Relation r : relations) {
                 Relation newRelation = new Relation(r, r.isNew());
                 newRelation.setMembers(null);
                 primMap.put(r, newRelation);
                 addPrimitive(newRelation);
             }
-            for (Relation r : copyFrom.relations) {
+            for (Relation r : relations) {
                 Relation newRelation = (Relation) primMap.get(r);
                 List<RelationMember> newMembers = new ArrayList<>();
                 for (RelationMember rm: r.getMembers()) {
@@ -397,12 +417,6 @@ public final class DataSet implements Data, ProjectionChangeListener {
     }
 
     /**
-     * All nodes goes here, even when included in other data (ways etc). This enables the instant
-     * conversion of the whole DataSet by iterating over this data structure.
-     */
-    private final QuadBuckets<Node> nodes = new QuadBuckets<>();
-
-    /**
      * Gets a filtered collection of primitives matching the given predicate.
      * @param <T> The primitive type.
      * @param predicate The predicate to match
@@ -422,40 +436,17 @@ public final class DataSet implements Data, ProjectionChangeListener {
         return getPrimitives(Node.class::isInstance);
     }
 
-    /**
-     * Searches for nodes in the given bounding box.
-     * @param bbox the bounding box
-     * @return List of nodes in the given bbox. Can be empty but not null
-     */
+    @Override
     public List<Node> searchNodes(BBox bbox) {
         lock.readLock().lock();
         try {
-            return nodes.search(bbox);
+            return super.searchNodes(bbox);
         } finally {
             lock.readLock().unlock();
         }
     }
 
     /**
-     * Determines if the given node can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
-     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
-     *
-     * @param n The node to search
-     * @return {@code true} if {@code n} ban be retrieved in this data set, {@code false} otherwise
-     * @since 7501
-     */
-    public boolean containsNode(Node n) {
-        return nodes.contains(n);
-    }
-
-    /**
-     * All ways (Streets etc.) in the DataSet.
-     *
-     * The way nodes are stored only in the way list.
-     */
-    private final QuadBuckets<Way> ways = new QuadBuckets<>();
-
-    /**
      * Replies an unmodifiable collection of ways in this dataset
      *
      * @return an unmodifiable collection of ways in this dataset
@@ -464,73 +455,38 @@ public final class DataSet implements Data, ProjectionChangeListener {
         return getPrimitives(Way.class::isInstance);
     }
 
-    /**
-     * Searches for ways in the given bounding box.
-     * @param bbox the bounding box
-     * @return List of ways in the given bbox. Can be empty but not null
-     */
+    @Override
     public List<Way> searchWays(BBox bbox) {
         lock.readLock().lock();
         try {
-            return ways.search(bbox);
+            return super.searchWays(bbox);
         } finally {
             lock.readLock().unlock();
         }
     }
 
     /**
-     * Determines if the given way can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
-     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
-     *
-     * @param w The way to search
-     * @return {@code true} if {@code w} ban be retrieved in this data set, {@code false} otherwise
-     * @since 7501
-     */
-    public boolean containsWay(Way w) {
-        return ways.contains(w);
-    }
-
-    /**
-     * All relations/relationships
-     */
-    private final Collection<Relation> relations = new ArrayList<>();
-
-    /**
-     * Replies an unmodifiable collection of relations in this dataset
-     *
-     * @return an unmodifiable collection of relations in this dataset
-     */
-    public Collection<Relation> getRelations() {
-        return getPrimitives(Relation.class::isInstance);
-    }
-
-    /**
      * Searches for relations in the given bounding box.
      * @param bbox the bounding box
      * @return List of relations in the given bbox. Can be empty but not null
      */
+    @Override
     public List<Relation> searchRelations(BBox bbox) {
         lock.readLock().lock();
         try {
-            // QuadBuckets might be useful here (don't forget to do reindexing after some of rm is changed)
-            return relations.stream()
-                    .filter(r -> r.getBBox().intersects(bbox))
-                    .collect(Collectors.toList());
+            return super.searchRelations(bbox);
         } finally {
             lock.readLock().unlock();
         }
     }
 
     /**
-     * Determines if the given relation can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
-     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
+     * Replies an unmodifiable collection of relations in this dataset
      *
-     * @param r The relation to search
-     * @return {@code true} if {@code r} ban be retrieved in this data set, {@code false} otherwise
-     * @since 7501
+     * @return an unmodifiable collection of relations in this dataset
      */
-    public boolean containsRelation(Relation r) {
-        return relations.contains(r);
+    public Collection<Relation> getRelations() {
+        return getPrimitives(Relation.class::isInstance);
     }
 
     /**
@@ -584,6 +540,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
      *
      * @param primitive the primitive.
      */
+    @Override
     public void addPrimitive(OsmPrimitive primitive) {
         Objects.requireNonNull(primitive, "primitive");
         beginUpdate();
@@ -595,16 +552,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
             allPrimitives.add(primitive);
             primitive.setDataset(this);
             primitive.updatePosition(); // Set cached bbox for way and relation (required for reindexWay and reindexRelation to work properly)
-            boolean success = false;
-            if (primitive instanceof Node) {
-                success = nodes.add((Node) primitive);
-            } else if (primitive instanceof Way) {
-                success = ways.add((Way) primitive);
-            } else if (primitive instanceof Relation) {
-                success = relations.add((Relation) primitive);
-            }
-            if (!success)
-                throw new JosmRuntimeException("failed to add primitive: "+primitive);
+            super.addPrimitive(primitive);
             firePrimitivesAdded(Collections.singletonList(primitive), false);
         } finally {
             endUpdate();
@@ -626,22 +574,25 @@ public final class DataSet implements Data, ProjectionChangeListener {
             OsmPrimitive primitive = getPrimitiveByIdChecked(primitiveId);
             if (primitive == null)
                 return;
-            boolean success = false;
-            if (primitive instanceof Node) {
-                success = nodes.remove(primitive);
-            } else if (primitive instanceof Way) {
-                success = ways.remove(primitive);
-            } else if (primitive instanceof Relation) {
-                success = relations.remove(primitive);
-            }
-            if (!success)
-                throw new JosmRuntimeException("failed to remove primitive: "+primitive);
-            synchronized (selectionLock) {
-                selectedPrimitives.remove(primitive);
-                selectionSnapshot = null;
-            }
-            allPrimitives.remove(primitive);
-            primitive.setDataset(null);
+            removePrimitiveImpl(primitive);
+            firePrimitivesRemoved(Collections.singletonList(primitive), false);
+        } finally {
+            endUpdate();
+        }
+    }
+
+    private void removePrimitiveImpl(OsmPrimitive primitive) {
+        clearSelection(primitive.getPrimitiveId());
+        super.removePrimitive(primitive);
+        allPrimitives.remove(primitive);
+        primitive.setDataset(null);
+    }
+
+    @Override
+    protected void removePrimitive(OsmPrimitive primitive) {
+        beginUpdate();
+        try {
+            removePrimitiveImpl(primitive);
             firePrimitivesRemoved(Collections.singletonList(primitive), false);
         } finally {
             endUpdate();
@@ -653,6 +604,31 @@ public final class DataSet implements Data, ProjectionChangeListener {
      *---------------------------------------------------*/
 
     /**
+     * Add a listener that listens to selection changes in this specific data set.
+     * @param listener The listener.
+     * @see #removeSelectionListener(DataSelectionListener)
+     * @see SelectionEventManager#addSelectionListener(SelectionChangedListener,
+     *      org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode)
+     *      To add a global listener.
+     */
+    public void addSelectionListener(DataSelectionListener listener) {
+        selectionListeners.addListener(listener);
+    }
+
+    /**
+     * Remove a listener that listens to selection changes in this specific data set.
+     * @param listener The listener.
+     * @see #addSelectionListener(DataSelectionListener)
+     */
+    public void removeSelectionListener(DataSelectionListener listener) {
+        selectionListeners.removeListener(listener);
+    }
+
+    /*---------------------------------------------------
+     *   OLD SELECTION HANDLING
+     *---------------------------------------------------*/
+
+    /**
      * A list of listeners to selection changed events. The list is static, as listeners register
      * themselves for any dataset selection changes that occur, regardless of the current active
      * dataset. (However, the selection does only change in the active layer)
@@ -662,6 +638,8 @@ public final class DataSet implements Data, ProjectionChangeListener {
     /**
      * Adds a new selection listener.
      * @param listener The selection listener to add
+     * @see #addSelectionListener(DataSelectionListener)
+     * @see SelectionEventManager#removeSelectionListener(SelectionChangedListener)
      */
     public static void addSelectionListener(SelectionChangedListener listener) {
         ((CopyOnWriteArrayList<SelectionChangedListener>) selListeners).addIfAbsent(listener);
@@ -670,6 +648,8 @@ public final class DataSet implements Data, ProjectionChangeListener {
     /**
      * Removes a selection listener.
      * @param listener The selection listener to remove
+     * @see #removeSelectionListener(DataSelectionListener)
+     * @see SelectionEventManager#removeSelectionListener(SelectionChangedListener)
      */
     public static void removeSelectionListener(SelectionChangedListener listener) {
         selListeners.remove(listener);
@@ -678,18 +658,19 @@ public final class DataSet implements Data, ProjectionChangeListener {
     /**
      * Notifies all registered {@link SelectionChangedListener} about the current selection in
      * this dataset.
-     *
+     * @deprecated You should never need to do this from the outside.
      */
+    @Deprecated
     public void fireSelectionChanged() {
-        Collection<? extends OsmPrimitive> currentSelection = getAllSelected();
+        fireDreprecatedSelectionChange(getAllSelected());
+    }
+
+    private static void fireDreprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
         for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(currentSelection);
         }
     }
 
-    private Set<OsmPrimitive> selectedPrimitives = new LinkedHashSet<>();
-    private Collection<OsmPrimitive> selectionSnapshot;
-
     /**
      * Returns selected nodes and ways.
      * @return selected nodes and ways
@@ -740,6 +721,8 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * Replies an unmodifiable collection of primitives currently selected
      * in this dataset, except deleted ones. May be empty, but not null.
      *
+     * When iterating through the set it is ordered by the order in which the primitives were added to the selection.
+     *
      * @return unmodifiable collection of primitives
      */
     public Collection<OsmPrimitive> getSelected() {
@@ -750,17 +733,12 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * Replies an unmodifiable collection of primitives currently selected
      * in this dataset, including deleted ones. May be empty, but not null.
      *
+     * When iterating through the set it is ordered by the order in which the primitives were added to the selection.
+     *
      * @return unmodifiable collection of primitives
      */
     public Collection<OsmPrimitive> getAllSelected() {
-        Collection<OsmPrimitive> currentList;
-        synchronized (selectionLock) {
-            if (selectionSnapshot == null) {
-                selectionSnapshot = Collections.unmodifiableList(new ArrayList<>(selectedPrimitives));
-            }
-            currentList = selectionSnapshot;
-        }
-        return currentList;
+        return currentSelectedPrimitives;
     }
 
     /**
@@ -792,7 +770,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * @return whether the selection is empty or not
      */
     public boolean selectionEmpty() {
-        return selectedPrimitives.isEmpty();
+        return currentSelectedPrimitives.isEmpty();
     }
 
     /**
@@ -801,45 +779,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * @return whether {@code osm} is selected or not
      */
     public boolean isSelected(OsmPrimitive osm) {
-        return selectedPrimitives.contains(osm);
-    }
-
-    /**
-     * Toggles the selected state of the given collection of primitives.
-     * @param osm The primitives to toggle
-     */
-    public void toggleSelected(Collection<? extends PrimitiveId> osm) {
-        boolean changed = false;
-        synchronized (selectionLock) {
-            for (PrimitiveId o : osm) {
-                changed = changed | this.dotoggleSelected(o);
-            }
-            if (changed) {
-                selectionSnapshot = null;
-            }
-        }
-        if (changed) {
-            fireSelectionChanged();
-        }
-    }
-
-    /**
-     * Toggles the selected state of the given collection of primitives.
-     * @param osm The primitives to toggle
-     */
-    public void toggleSelected(PrimitiveId... osm) {
-        toggleSelected(Arrays.asList(osm));
-    }
-
-    private boolean dotoggleSelected(PrimitiveId primitiveId) {
-        OsmPrimitive primitive = getPrimitiveByIdChecked(primitiveId);
-        if (primitive == null)
-            return false;
-        if (!selectedPrimitives.remove(primitive)) {
-            selectedPrimitives.add(primitive);
-        }
-        selectionSnapshot = null;
-        return true;
+        return currentSelectedPrimitives.contains(osm);
     }
 
     /**
@@ -874,23 +814,11 @@ public final class DataSet implements Data, ProjectionChangeListener {
      *
      * @param selection the selection
      * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
+     * @deprecated Use {@link #setSelected(Collection)} instead. To bee removed end of 2017. Does not seem to be used by plugins.
      */
+    @Deprecated
     public void setSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
-        boolean changed;
-        synchronized (selectionLock) {
-            Set<OsmPrimitive> oldSelection = new LinkedHashSet<>(selectedPrimitives);
-            selectedPrimitives = new LinkedHashSet<>();
-            addSelected(selection, false);
-            changed = !oldSelection.equals(selectedPrimitives);
-            if (changed) {
-                selectionSnapshot = null;
-            }
-        }
-
-        if (changed && fireSelectionChangeEvent) {
-            // If selection is not empty then event was already fired in addSelecteds
-            fireSelectionChanged();
-        }
+        setSelected(selection);
     }
 
     /**
@@ -900,22 +828,22 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * @param selection the selection
      */
     public void setSelected(Collection<? extends PrimitiveId> selection) {
-        setSelected(selection, true /* fire selection change event */);
+        setSelected(selection.stream());
     }
 
     /**
      * Sets the current selection to the primitives in <code>osm</code>
      * and notifies all {@link SelectionChangedListener}.
      *
-     * @param osm the primitives to set
+     * @param osm the primitives to set. <code>null</code> values are ignored for now, but this may be removed in the future.
      */
     public void setSelected(PrimitiveId... osm) {
-        if (osm.length == 1 && osm[0] == null) {
-            setSelected();
-            return;
-        }
-        List<PrimitiveId> list = Arrays.asList(osm);
-        setSelected(list);
+        setSelected(Stream.of(osm).filter(Objects::nonNull));
+    }
+
+    private void setSelected(Stream<? extends PrimitiveId> stream) {
+        doSelectionChange(old -> new SelectionReplaceEvent(this, old,
+                stream.map(this::getPrimitiveByIdChecked).filter(Objects::nonNull)));
     }
 
     /**
@@ -925,7 +853,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * @param selection the selection
      */
     public void addSelected(Collection<? extends PrimitiveId> selection) {
-        addSelected(selection, true /* fire selection change event */);
+        addSelected(selection.stream());
     }
 
     /**
@@ -935,91 +863,95 @@ public final class DataSet implements Data, ProjectionChangeListener {
      * @param osm the primitives to add
      */
     public void addSelected(PrimitiveId... osm) {
-        addSelected(Arrays.asList(osm));
+        addSelected(Stream.of(osm));
+    }
+
+    private void addSelected(Stream<? extends PrimitiveId> stream) {
+        doSelectionChange(old -> new SelectionAddEvent(this, old,
+                stream.map(this::getPrimitiveByIdChecked).filter(Objects::nonNull)));
     }
 
     /**
-     * Adds the primitives in <code>selection</code> to the current selection.
-     * Notifies all {@link SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
-     *
-     * @param selection the selection
-     * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
-     * @return if the selection was changed in the process
+     * Removes the selection from every value in the collection.
+     * @param osm The collection of ids to remove the selection from.
      */
-    private boolean addSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
-        boolean changed = false;
-        synchronized (selectionLock) {
-            for (PrimitiveId id: selection) {
-                OsmPrimitive primitive = getPrimitiveByIdChecked(id);
-                if (primitive != null) {
-                    changed = changed | selectedPrimitives.add(primitive);
-                }
-            }
-            if (changed) {
-                selectionSnapshot = null;
-            }
-        }
-        if (fireSelectionChangeEvent && changed) {
-            fireSelectionChanged();
-        }
-        return changed;
+    public void clearSelection(PrimitiveId... osm) {
+        clearSelection(Stream.of(osm));
     }
 
     /**
-     * clear all highlights of virtual nodes
+     * Removes the selection from every value in the collection.
+     * @param list The collection of ids to remove the selection from.
      */
-    public void clearHighlightedVirtualNodes() {
-        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
+    public void clearSelection(Collection<? extends PrimitiveId> list) {
+        clearSelection(list.stream());
     }
 
     /**
-     * clear all highlights of way segments
+     * Clears the current selection.
      */
-    public void clearHighlightedWaySegments() {
-        setHighlightedWaySegments(new ArrayList<WaySegment>());
+    public void clearSelection() {
+        setSelected(Stream.empty());
+    }
+
+    private void clearSelection(Stream<? extends PrimitiveId> stream) {
+        doSelectionChange(old -> new SelectionRemoveEvent(this, old,
+                stream.map(this::getPrimitiveByIdChecked).filter(Objects::nonNull)));
     }
 
     /**
-     * Removes the selection from every value in the collection.
-     * @param osm The collection of ids to remove the selection from.
+     * Toggles the selected state of the given collection of primitives.
+     * @param osm The primitives to toggle
      */
-    public void clearSelection(PrimitiveId... osm) {
-        clearSelection(Arrays.asList(osm));
+    public void toggleSelected(Collection<? extends PrimitiveId> osm) {
+        toggleSelected(osm.stream());
     }
 
     /**
-     * Removes the selection from every value in the collection.
-     * @param list The collection of ids to remove the selection from.
+     * Toggles the selected state of the given collection of primitives.
+     * @param osm The primitives to toggle
      */
-    public void clearSelection(Collection<? extends PrimitiveId> list) {
-        boolean changed = false;
+    public void toggleSelected(PrimitiveId... osm) {
+        toggleSelected(Stream.of(osm));
+    }
+
+    private void toggleSelected(Stream<? extends PrimitiveId> stream) {
+        doSelectionChange(old -> new SelectionToggleEvent(this, old,
+                stream.map(this::getPrimitiveByIdChecked).filter(Objects::nonNull)));
+    }
+
+    /**
+     * Do a selection change.
+     * <p>
+     * This is the only method that changes the current selection state.
+     * @param command A generator that generates the {@link SelectionChangeEvent} for the given base set of currently selected primitives.
+     * @return true iff the command did change the selection.
+     * @since 12048
+     */
+    private boolean doSelectionChange(Function<Set<OsmPrimitive>, SelectionChangeEvent> command) {
         synchronized (selectionLock) {
-            for (PrimitiveId id:list) {
-                OsmPrimitive primitive = getPrimitiveById(id);
-                if (primitive != null) {
-                    changed = changed | selectedPrimitives.remove(primitive);
-                }
-            }
-            if (changed) {
-                selectionSnapshot = null;
+            SelectionChangeEvent event = command.apply(currentSelectedPrimitives);
+            if (event.isNop()) {
+                return false;
             }
-        }
-        if (changed) {
-            fireSelectionChanged();
+            currentSelectedPrimitives = event.getSelection();
+            selectionListeners.fireEvent(l -> l.selectionChanged(event));
+            return true;
         }
     }
 
     /**
-     * Clears the current selection.
+     * clear all highlights of virtual nodes
      */
-    public void clearSelection() {
-        if (!selectedPrimitives.isEmpty()) {
-            synchronized (selectionLock) {
-                selectedPrimitives.clear();
-                selectionSnapshot = null;
-            }
-            fireSelectionChanged();
-        }
+    public void clearHighlightedVirtualNodes() {
+        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
+    }
+
+    /**
+     * clear all highlights of way segments
+     */
+    public void clearHighlightedWaySegments() {
+        setHighlightedWaySegments(new ArrayList<WaySegment>());
     }
 
     @Override
@@ -1097,7 +1029,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
         Set<Way> result = new HashSet<>();
         beginUpdate();
         try {
-            for (Way way : OsmPrimitive.getFilteredList(node.getReferrers(), Way.class)) {
+            for (Way way : node.getParentWays()) {
                 List<Node> wayNodes = way.getNodes();
                 if (wayNodes.remove(node)) {
                     if (wayNodes.size() < 2) {
@@ -1124,7 +1056,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
         Set<Relation> result = new HashSet<>();
         beginUpdate();
         try {
-            for (Relation relation : relations) {
+            for (Relation relation : getRelations()) {
                 List<RelationMember> members = relation.getMembers();
 
                 Iterator<RelationMember> it = members.iterator();
@@ -1183,45 +1115,6 @@ public final class DataSet implements Data, ProjectionChangeListener {
         return false;
     }
 
-    private void reindexNode(Node node, LatLon newCoor, EastNorth eastNorth) {
-        if (!nodes.remove(node))
-            throw new JosmRuntimeException("Reindexing node failed to remove");
-        node.setCoorInternal(newCoor, eastNorth);
-        if (!nodes.add(node))
-            throw new JosmRuntimeException("Reindexing node failed to add");
-        for (OsmPrimitive primitive: node.getReferrers()) {
-            if (primitive instanceof Way) {
-                reindexWay((Way) primitive);
-            } else {
-                reindexRelation((Relation) primitive);
-            }
-        }
-    }
-
-    private void reindexWay(Way way) {
-        BBox before = way.getBBox();
-        if (!ways.remove(way))
-            throw new JosmRuntimeException("Reindexing way failed to remove");
-        way.updatePosition();
-        if (!ways.add(way))
-            throw new JosmRuntimeException("Reindexing way failed to add");
-        if (!way.getBBox().equals(before)) {
-            for (OsmPrimitive primitive: way.getReferrers()) {
-                reindexRelation((Relation) primitive);
-            }
-        }
-    }
-
-    private static void reindexRelation(Relation relation) {
-        BBox before = relation.getBBox();
-        relation.updatePosition();
-        if (!before.equals(relation.getBBox())) {
-            for (OsmPrimitive primitive: relation.getReferrers()) {
-                reindexRelation((Relation) primitive);
-            }
-        }
-    }
-
     /**
      * Adds a new data set listener.
      * @param dsl The data set listener to add
@@ -1355,9 +1248,9 @@ public final class DataSet implements Data, ProjectionChangeListener {
      */
     public void invalidateEastNorthCache() {
         if (Main.getProjection() == null) return; // sanity check
+        beginUpdate();
         try {
-            beginUpdate();
-            for (Node n: Utils.filteredCollection(allPrimitives, Node.class)) {
+            for (Node n: getNodes()) {
                 n.invalidateEastNorthCache();
             }
         } finally {
@@ -1371,47 +1264,26 @@ public final class DataSet implements Data, ProjectionChangeListener {
     public void cleanupDeletedPrimitives() {
         beginUpdate();
         try {
-            boolean changed = cleanupDeleted(nodes.iterator());
-            if (cleanupDeleted(ways.iterator())) {
-                changed = true;
-            }
-            if (cleanupDeleted(relations.iterator())) {
-                changed = true;
-            }
-            if (changed) {
-                fireSelectionChanged();
+            Collection<OsmPrimitive> toCleanUp = getPrimitives(
+                    primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
+            if (!toCleanUp.isEmpty()) {
+                // We unselect them in advance to not fire a selection change for every primitive
+                clearSelection(toCleanUp.stream().map(OsmPrimitive::getPrimitiveId));
+                for (OsmPrimitive primitive : toCleanUp) {
+                    removePrimitiveImpl(primitive);
+                }
+                firePrimitivesRemoved(toCleanUp, false);
             }
         } finally {
             endUpdate();
         }
     }
 
-    private boolean cleanupDeleted(Iterator<? extends OsmPrimitive> it) {
-        boolean changed = false;
-        synchronized (selectionLock) {
-            while (it.hasNext()) {
-                OsmPrimitive primitive = it.next();
-                if (primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew())) {
-                    selectedPrimitives.remove(primitive);
-                    selectionSnapshot = null;
-                    allPrimitives.remove(primitive);
-                    primitive.setDataset(null);
-                    changed = true;
-                    it.remove();
-                }
-            }
-            if (changed) {
-                selectionSnapshot = null;
-            }
-        }
-        return changed;
-    }
-
     /**
      * Removes all primitives from the dataset and resets the currently selected primitives
      * to the empty collection. Also notifies selection change listeners if necessary.
-     *
      */
+    @Override
     public void clear() {
         beginUpdate();
         try {
@@ -1419,9 +1291,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
             for (OsmPrimitive primitive:allPrimitives) {
                 primitive.setDataset(null);
             }
-            nodes.clear();
-            ways.clear();
-            relations.clear();
+            super.clear();
             allPrimitives.clear();
         } finally {
             endUpdate();
diff --git a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
index be1f32d..b6883a1 100644
--- a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
@@ -6,6 +6,9 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * The default event implementation that is used to indicate a change in the {@link ChangesetCache}
+ */
 public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
 
     private final Set<Changeset> added;
@@ -13,6 +16,10 @@ public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
     private final Set<Changeset> removed;
     private final ChangesetCache source;
 
+    /**
+     * Creates a basic, empty {@link ChangesetCacheEvent}
+     * @param source The source changeset
+     */
     public DefaultChangesetCacheEvent(ChangesetCache source) {
         this.source = source;
         added = new HashSet<>();
@@ -21,6 +28,11 @@ public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
     }
 
     @Override
+    public ChangesetCache getSource() {
+        return source;
+    }
+
+    @Override
     public Collection<Changeset> getAddedChangesets() {
         return Collections.unmodifiableCollection(added);
     }
@@ -31,30 +43,41 @@ public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
     }
 
     @Override
-    public ChangesetCache getSource() {
-        return source;
-    }
-
-    @Override
     public Collection<Changeset> getUpdatedChangesets() {
         return Collections.unmodifiableCollection(modified);
     }
 
+    /**
+     * Adds a {@link Changeset} to the added list
+     * @param cs the {@link Changeset}
+     */
     public void rememberAddedChangeset(Changeset cs) {
         if (cs == null) return;
         added.add(cs);
     }
 
+    /**
+     * Adds a {@link Changeset} to the updated list
+     * @param cs the {@link Changeset}
+     */
     public void rememberUpdatedChangeset(Changeset cs) {
         if (cs == null) return;
         modified.add(cs);
     }
 
+    /**
+     * Adds a {@link Changeset} to the removed list
+     * @param cs the {@link Changeset}
+     */
     public void rememberRemovedChangeset(Changeset cs) {
         if (cs == null) return;
         removed.add(cs);
     }
 
+    /**
+     * Checks if this event contains any {@link Changeset}s
+     * @return <code>true</code> if changesets were added
+     */
     public boolean isEmpty() {
         return added.isEmpty() && modified.isEmpty() && removed.isEmpty();
     }
diff --git a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
index 4e94bc1..7fc948d 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
@@ -224,7 +224,8 @@ public class FilterMatcher {
 
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
 
-        if (primitive.isIncomplete() || (Main.map != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
+        if (primitive.isIncomplete() ||
+                (Main.map != null && Main.map.mapMode != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
             return FilterType.NOT_FILTERED;
 
         boolean filtered = false;
diff --git a/src/org/openstreetmap/josm/data/osm/INode.java b/src/org/openstreetmap/josm/data/osm/INode.java
index b9b43c5..02d7b8a 100644
--- a/src/org/openstreetmap/josm/data/osm/INode.java
+++ b/src/org/openstreetmap/josm/data/osm/INode.java
@@ -2,13 +2,14 @@
 package org.openstreetmap.josm.data.osm;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
  * INode captures the common functions of {@link Node} and {@link NodeData}.
  * @since 4098
  */
-public interface INode extends IPrimitive {
+public interface INode extends IPrimitive, ILatLon {
 
     /**
      * Returns lat/lon coordinates of this node.
@@ -23,12 +24,6 @@ public interface INode extends IPrimitive {
     void setCoor(LatLon coor);
 
     /**
-     * Returns east/north coordinates of this node.
-     * @return east/north coordinates of this node
-     */
-    EastNorth getEastNorth();
-
-    /**
      * Sets east/north coordinates of this node.
      * @param eastNorth east/north coordinates of this node
      */
diff --git a/src/org/openstreetmap/josm/data/osm/NameFormatter.java b/src/org/openstreetmap/josm/data/osm/NameFormatter.java
index 8af2fd9..ca6333c 100644
--- a/src/org/openstreetmap/josm/data/osm/NameFormatter.java
+++ b/src/org/openstreetmap/josm/data/osm/NameFormatter.java
@@ -41,9 +41,21 @@ public interface NameFormatter {
      */
     String format(Changeset changeset);
 
+    /**
+     * Gets a comparator that sorts the nodes by the string that this formatter would create for them
+     * @return That comparator
+     */
     Comparator<Node> getNodeComparator();
 
+    /**
+     * Gets a comparator that sorts the ways by the string that this formatter would create for them
+     * @return That comparator
+     */
     Comparator<Way> getWayComparator();
 
+    /**
+     * Gets a comparator that sorts the relations by the string that this formatter would create for them
+     * @return That comparator
+     */
     Comparator<Relation> getRelationComparator();
 }
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index 027fb53..151f63b 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -47,7 +47,9 @@ public final class Node extends OsmPrimitive implements INode {
      * @return {@code true} if this node has valid coordinates
      * @since 7828
      */
+    @Override
     public boolean isLatLonKnown() {
+        // We cannot use default implementation - if we remove this implementation, we will break binary compatibility.
         return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 
@@ -80,42 +82,31 @@ public final class Node extends OsmPrimitive implements INode {
      */
     @Override
     public LatLon getCoor() {
-        if (!isLatLonKnown()) return null;
-        return new LatLon(lat, lon);
+        if (!isLatLonKnown()) {
+            return null;
+        } else {
+            return new LatLon(lat, lon);
+        }
     }
 
-    /**
-     * <p>Replies the projected east/north coordinates.</p>
-     *
-     * <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
-     * Internally caches the projected coordinates.</p>
-     *
-     * <p>Replies {@code null} if this node doesn't know lat/lon-coordinates, i.e. because it is an incomplete node.
-     *
-     * @return the east north coordinates or {@code null}
-     * @see #invalidateEastNorthCache()
-     *
-     */
     @Override
-    public EastNorth getEastNorth() {
-        return getEastNorth(Main.getProjection());
+    public double lat() {
+        return lat;
     }
 
-    /**
-     * Replies the projected east/north coordinates.
-     * <p>
-     * The result of the last conversion is cached. The cache object is used as cache key.
-     * @param projection The projection to use.
-     * @return The projected east/north coordinates
-     * @since 10827
-     */
-    public EastNorth getEastNorth(Projection projection) {
+    @Override
+    public double lon() {
+        return lon;
+    }
+
+    @Override
+    public EastNorth getEastNorth(Projecting projection) {
         if (!isLatLonKnown()) return null;
 
         if (Double.isNaN(east) || Double.isNaN(north) || !Objects.equals(projection.getCacheKey(), eastNorthCacheKey)) {
             // projected coordinates haven't been calculated yet,
             // so fill the cache of the projected node coordinates
-            EastNorth en = Projections.project(new LatLon(lat, lon));
+            EastNorth en = projection.latlon2eastNorth(this);
             this.east = en.east();
             this.north = en.north();
             this.eastNorthCacheKey = projection.getCacheKey();
diff --git a/src/org/openstreetmap/josm/data/osm/NodeData.java b/src/org/openstreetmap/josm/data/osm/NodeData.java
index df54c9e..ddc3e63 100644
--- a/src/org/openstreetmap/josm/data/osm/NodeData.java
+++ b/src/org/openstreetmap/josm/data/osm/NodeData.java
@@ -6,6 +6,9 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * The data on a single node (tags and position) that is stored in the database
+ */
 public class NodeData extends PrimitiveData implements INode {
 
     private static final long serialVersionUID = 5626323599550908773L;
@@ -40,7 +43,18 @@ public class NodeData extends PrimitiveData implements INode {
         setCoor(data.getCoor());
     }
 
-    private boolean isLatLonKnown() {
+    @Override
+    public double lat() {
+        return lat;
+    }
+
+    @Override
+    public double lon() {
+        return lon;
+    }
+
+    @Override
+    public boolean isLatLonKnown() {
         return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 
diff --git a/src/org/openstreetmap/josm/data/osm/NodePositionComparator.java b/src/org/openstreetmap/josm/data/osm/NodePositionComparator.java
index a6b0312..96aa69a 100644
--- a/src/org/openstreetmap/josm/data/osm/NodePositionComparator.java
+++ b/src/org/openstreetmap/josm/data/osm/NodePositionComparator.java
@@ -19,7 +19,7 @@ public class NodePositionComparator implements Comparator<Node>, Serializable {
         if (n1.getCoor().equalsEpsilon(n2.getCoor()))
             return 0;
 
-        int dLat = Double.compare(n1.getCoor().lat(), n2.getCoor().lat());
-        return dLat != 0 ? dLat : Double.compare(n1.getCoor().lon(), n2.getCoor().lon());
+        int dLat = Double.compare(n1.lat(), n2.lat());
+        return dLat != 0 ? dLat : Double.compare(n1.lon(), n2.lon());
     }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 8a5124a..248bacc 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -1013,6 +1013,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
         return result;
     }
 
+    /**
+     * Gets a list of all primitives in the current dataset that reference this primitive.
+     * @return The referrers
+     */
     public final List<OsmPrimitive> getReferrers() {
         return getReferrers(false);
     }
@@ -1351,7 +1355,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
      */
     public final boolean hasAreaTags() {
         return hasKey("landuse", "amenity", "building", "building:part")
-                || hasTag("area", "yes")
+                || hasTag("area", OsmUtils.TRUE_VALUE)
                 || hasTag("waterway", "riverbank")
                 || hasTagDifferent("leisure", "picnic_table", "slipway", "firepit")
                 || hasTag("natural", "water", "wood", "scrub", "wetland", "grassland", "heath", "rock", "bare_rock",
diff --git a/src/org/openstreetmap/josm/data/osm/OsmUtils.java b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
index 62de4ed..ae2eaf8 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmUtils.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
@@ -11,6 +11,9 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.TextTagParser;
 
+/**
+ * Utility methods/constants that are useful for generic OSM tag handling.
+ */
 public final class OsmUtils {
 
     private static final Set<String> TRUE_VALUES = new HashSet<>(Arrays
@@ -20,14 +23,46 @@ public final class OsmUtils {
     private static final Set<String> REVERSE_VALUES = new HashSet<>(Arrays
             .asList("reverse", "-1"));
 
-    public static final String trueval = "yes";
-    public static final String falseval = "no";
-    public static final String reverseval = "-1";
+    /**
+     * A value that should be used to indicate true
+     * @since 12186
+     */
+    public static final String TRUE_VALUE = "yes";
+    /**
+     * A value that should be used to indicate false
+     * @since 12186
+     */
+    public static final String FALSE_VALUE = "no";
+    /**
+     * A value that should be used to indicate that a property applies reversed on the way
+     * @since 12186
+     */
+    public static final String REVERSE_VALUE = "-1";
+
+    /**
+     * Discouraged synonym for {@link #TRUE_VALUE}
+     */
+    public static final String trueval = TRUE_VALUE;
+    /**
+     * Discouraged synonym for {@link #FALSE_VALUE}
+     */
+    public static final String falseval = FALSE_VALUE;
+    /**
+     * Discouraged synonym for {@link #REVERSE_VALUE}
+     */
+    public static final String reverseval = REVERSE_VALUE;
 
     private OsmUtils() {
         // Hide default constructor for utils classes
     }
 
+    /**
+     * Converts a string to a boolean value
+     * @param value The string to convert
+     * @return {@link Boolean#TRUE} if that string represents a true value,
+     *         {@link Boolean#FALSE} if it represents a false value,
+     *         <code>null</code> otherwise.
+     */
     public static Boolean getOsmBoolean(String value) {
         if (value == null) return null;
         String lowerValue = value.toLowerCase(Locale.ENGLISH);
@@ -36,19 +71,41 @@ public final class OsmUtils {
         return null;
     }
 
+    /**
+     * Normalizes the OSM boolean value
+     * @param value The tag value
+     * @return The best true/false value or the old value if the input cannot be converted.
+     * @see #TRUE_VALUE
+     * @see #FALSE_VALUE
+     */
     public static String getNamedOsmBoolean(String value) {
         Boolean res = getOsmBoolean(value);
         return res == null ? value : (res ? trueval : falseval);
     }
 
+    /**
+     * Check if the value is a value indicating that a property applies reversed.
+     * @param value The value to check
+     * @return true if it is reversed.
+     */
     public static boolean isReversed(String value) {
         return REVERSE_VALUES.contains(value);
     }
 
+    /**
+     * Check if a tag value represents a boolean true value
+     * @param value The value to check
+     * @return true if it is a true value.
+     */
     public static boolean isTrue(String value) {
         return TRUE_VALUES.contains(value);
     }
 
+    /**
+     * Check if a tag value represents a boolean false value
+     * @param value The value to check
+     * @return true if it is a true value.
+     */
     public static boolean isFalse(String value) {
         return FALSE_VALUES.contains(value);
     }
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java b/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java
new file mode 100644
index 0000000..559979c
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java
@@ -0,0 +1,200 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
+
+/**
+ * Stores primitives in quad buckets. This can be used to hold a collection of primitives, e.g. in a {@link DataSet}
+ *
+ * This class does not do any synchronization.
+ * @author Michael Zangl
+ * @since 12048
+ */
+public class QuadBucketPrimitiveStore {
+    /**
+     * All nodes goes here, even when included in other data (ways etc). This enables the instant
+     * conversion of the whole DataSet by iterating over this data structure.
+     */
+    private final QuadBuckets<Node> nodes = new QuadBuckets<>();
+
+    /**
+     * All ways (Streets etc.) in the DataSet.
+     *
+     * The way nodes are stored only in the way list.
+     */
+    private final QuadBuckets<Way> ways = new QuadBuckets<>();
+
+    /**
+     * All relations/relationships
+     */
+    private final Collection<Relation> relations = new ArrayList<>();
+
+    /**
+     * Searches for nodes in the given bounding box.
+     * @param bbox the bounding box
+     * @return List of nodes in the given bbox. Can be empty but not null
+     */
+    public List<Node> searchNodes(BBox bbox) {
+        return nodes.search(bbox);
+    }
+
+    /**
+     * Determines if the given node can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
+     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
+     *
+     * @param n The node to search
+     * @return {@code true} if {@code n} ban be retrieved in this data set, {@code false} otherwise
+     * @since 7501
+     */
+    public boolean containsNode(Node n) {
+        return nodes.contains(n);
+    }
+
+    /**
+     * Searches for ways in the given bounding box.
+     * @param bbox the bounding box
+     * @return List of ways in the given bbox. Can be empty but not null
+     */
+    public List<Way> searchWays(BBox bbox) {
+        return ways.search(bbox);
+    }
+
+    /**
+     * Determines if the given way can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
+     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
+     *
+     * @param w The way to search
+     * @return {@code true} if {@code w} ban be retrieved in this data set, {@code false} otherwise
+     * @since 7501
+     */
+    public boolean containsWay(Way w) {
+        return ways.contains(w);
+    }
+
+    /**
+     * Searches for relations in the given bounding box.
+     * @param bbox the bounding box
+     * @return List of relations in the given bbox. Can be empty but not null
+     */
+    public List<Relation> searchRelations(BBox bbox) {
+        // QuadBuckets might be useful here (don't forget to do reindexing after some of rm is changed)
+        return relations.stream()
+                .filter(r -> r.getBBox().intersects(bbox))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Determines if the given relation can be retrieved in the data set through its bounding box. Useful for dataset consistency test.
+     * For efficiency reasons this method does not lock the dataset, you have to lock it manually.
+     *
+     * @param r The relation to search
+     * @return {@code true} if {@code r} ban be retrieved in this data set, {@code false} otherwise
+     * @since 7501
+     */
+    public boolean containsRelation(Relation r) {
+        return relations.contains(r);
+    }
+
+    /**
+     * Adds a primitive to this quad bucket store
+     *
+     * @param primitive the primitive.
+     */
+    public void addPrimitive(OsmPrimitive primitive) {
+        boolean success = false;
+        if (primitive instanceof Node) {
+            success = nodes.add((Node) primitive);
+        } else if (primitive instanceof Way) {
+            success = ways.add((Way) primitive);
+        } else if (primitive instanceof Relation) {
+            success = relations.add((Relation) primitive);
+        }
+        if (!success) {
+            throw new JosmRuntimeException("failed to add primitive: "+primitive);
+        }
+    }
+
+    protected void removePrimitive(OsmPrimitive primitive) {
+        boolean success = false;
+        if (primitive instanceof Node) {
+            success = nodes.remove(primitive);
+        } else if (primitive instanceof Way) {
+            success = ways.remove(primitive);
+        } else if (primitive instanceof Relation) {
+            success = relations.remove(primitive);
+        }
+        if (!success) {
+            throw new JosmRuntimeException("failed to remove primitive: "+primitive);
+        }
+    }
+
+    /**
+     * Re-index the relation after it's position was changed.
+     * @param node The node to re-index
+     * @param newCoor The new coordinates
+     * @param eastNorth The new east/north position
+     */
+    protected void reindexNode(Node node, LatLon newCoor, EastNorth eastNorth) {
+        if (!nodes.remove(node))
+            throw new JosmRuntimeException("Reindexing node failed to remove");
+        node.setCoorInternal(newCoor, eastNorth);
+        if (!nodes.add(node))
+            throw new JosmRuntimeException("Reindexing node failed to add");
+        for (OsmPrimitive primitive: node.getReferrers()) {
+            if (primitive instanceof Way) {
+                reindexWay((Way) primitive);
+            } else {
+                reindexRelation((Relation) primitive);
+            }
+        }
+    }
+
+    /**
+     * Re-index the way after it's position was changed.
+     * @param way The way to re-index
+     */
+    protected void reindexWay(Way way) {
+        BBox before = way.getBBox();
+        if (!ways.remove(way))
+            throw new JosmRuntimeException("Reindexing way failed to remove");
+        way.updatePosition();
+        if (!ways.add(way))
+            throw new JosmRuntimeException("Reindexing way failed to add");
+        if (!way.getBBox().equals(before)) {
+            for (OsmPrimitive primitive: way.getReferrers()) {
+                reindexRelation((Relation) primitive);
+            }
+        }
+    }
+
+    /**
+     * Re-index the relation after it's position was changed.
+     * @param relation The relation to re-index
+     */
+    protected static void reindexRelation(Relation relation) {
+        BBox before = relation.getBBox();
+        relation.updatePosition();
+        if (!before.equals(relation.getBBox())) {
+            for (OsmPrimitive primitive: relation.getReferrers()) {
+                reindexRelation((Relation) primitive);
+            }
+        }
+    }
+
+
+    /**
+     * Removes all primitives from the this store.
+     */
+    public void clear() {
+        nodes.clear();
+        ways.clear();
+        relations.clear();
+    }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index 7dbb99a..cc2f0f1 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -404,7 +404,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
     public boolean removeAll(Collection<?> objects) {
         boolean changed = false;
         for (Object o : objects) {
-            changed = changed | remove(o);
+            changed |= remove(o);
         }
         return changed;
     }
@@ -413,7 +413,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
     public boolean addAll(Collection<? extends T> objects) {
         boolean changed = false;
         for (T o : objects) {
-            changed = changed | this.add(o);
+            changed |= add(o);
         }
         return changed;
     }
diff --git a/src/org/openstreetmap/josm/data/osm/RelationMemberData.java b/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
index ff312b1..435ffb8 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
@@ -6,6 +6,9 @@ import java.util.Objects;
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * This is the data (role, type and id) that is stored in the database for a given relation member.
+ */
 public class RelationMemberData implements PrimitiveId, Serializable {
 
     private static final long serialVersionUID = 381392198209333319L;
diff --git a/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java b/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
index 0597bee..e4734ca 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
@@ -6,6 +6,9 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
+/**
+ * This is an extension of {@link RelationMember} that stores the parent relation and the index in it in addition to the role/child.
+ */
 public class RelationToChildReference {
 
     /**
@@ -47,6 +50,13 @@ public class RelationToChildReference {
     private final String role;
     private final OsmPrimitive child;
 
+    /**
+     * Create a new {@link RelationToChildReference}
+     * @param parent The parent relation
+     * @param position The position of the child in the parent
+     * @param role The role of the child
+     * @param child The actual child (member of parent)
+     */
     public RelationToChildReference(Relation parent, int position, String role, OsmPrimitive child) {
         this.parent = parent;
         this.position = position;
@@ -54,25 +64,44 @@ public class RelationToChildReference {
         this.child = child;
     }
 
+    /**
+     * Create a new {@link RelationToChildReference}
+     * @param parent The parent relation
+     * @param position The position of the child in the parent
+     * @param member The role and relation for the child
+     */
     public RelationToChildReference(Relation parent, int position, RelationMember member) {
-        this.parent = parent;
-        this.position = position;
-        this.role = member.getRole();
-        this.child = member.getMember();
+        this(parent, position, member.getRole(), member.getMember());
     }
 
+    /**
+     * Get the parent relation
+     * @return The parent
+     */
     public Relation getParent() {
         return parent;
     }
 
+    /**
+     * Get the position of the child in the parent
+     * @return The position of the child
+     */
     public int getPosition() {
         return position;
     }
 
+    /**
+     * Get the role of the child
+     * @return The role
+     */
     public String getRole() {
         return role;
     }
 
+    /**
+     * Get the actual child
+     * @return The child
+     */
     public OsmPrimitive getChild() {
         return child;
     }
diff --git a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
index a53bd77..93268f6 100644
--- a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
+++ b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
@@ -9,6 +9,9 @@ import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * A primitive id and a primitive type
+ */
 public class SimplePrimitiveId implements PrimitiveId, Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -16,10 +19,21 @@ public class SimplePrimitiveId implements PrimitiveId, Serializable {
     private final long id;
     private final OsmPrimitiveType type;
 
+    /**
+     * A pattern that is used to parse a textual primitive id
+     */
     public static final Pattern ID_PATTERN = Pattern.compile("(n|node|w|way|r|rel|relation)[ /]?(\\d+)");
 
+    /**
+     * A pattern that is used to parse an id range
+     */
     public static final Pattern MULTIPLE_IDS_PATTERN = Pattern.compile(ID_PATTERN.pattern() + "(-(\\d+))?");
 
+    /**
+     * Create a new primtive id
+     * @param id The id
+     * @param type The type of the primitive
+     */
     public SimplePrimitiveId(long id, OsmPrimitiveType type) {
         this.id = id;
         this.type = type;
diff --git a/src/org/openstreetmap/josm/data/osm/Way.java b/src/org/openstreetmap/josm/data/osm/Way.java
index 0b85a9e..a92844e 100644
--- a/src/org/openstreetmap/josm/data/osm/Way.java
+++ b/src/org/openstreetmap/josm/data/osm/Way.java
@@ -778,6 +778,10 @@ public final class Way extends OsmPrimitive implements IWay {
         clearCachedNodeStyles();
     }
 
+    /**
+     * Clears all cached styles for all nodes of this way. This should not be called from outside.
+     * @see Node#clearCachedStyle()
+     */
     public void clearCachedNodeStyles() {
         for (final Node n : nodes) {
             n.clearCachedStyle();
diff --git a/src/org/openstreetmap/josm/data/osm/WayData.java b/src/org/openstreetmap/josm/data/osm/WayData.java
index 6d12ed6..61f2314 100644
--- a/src/org/openstreetmap/josm/data/osm/WayData.java
+++ b/src/org/openstreetmap/josm/data/osm/WayData.java
@@ -6,6 +6,9 @@ import java.util.List;
 
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 
+/**
+ * The data (tags and node ids) that is stored for a way in the database
+ */
 public class WayData extends PrimitiveData implements IWay {
 
     private static final long serialVersionUID = 106944939313286415L;
@@ -36,6 +39,10 @@ public class WayData extends PrimitiveData implements IWay {
         nodes.addAll(data.getNodes());
     }
 
+    /**
+     * Gets a list of nodes the way consists of
+     * @return The ids of the nodes
+     */
     public List<Long> getNodes() {
         return nodes;
     }
@@ -56,6 +63,10 @@ public class WayData extends PrimitiveData implements IWay {
         return nodes.get(0).equals(nodes.get(nodes.size() - 1));
     }
 
+    /**
+     * Sets the nodes array
+     * @param nodes The nodes this way consists of
+     */
     public void setNodes(List<Long> nodes) {
         this.nodes = new ArrayList<>(nodes);
     }
diff --git a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
index bc50e8b..d65995e 100644
--- a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
@@ -16,14 +16,41 @@ public abstract class AbstractDatasetChangedEvent {
      * Type of dataset changed event, returned by {@link AbstractDatasetChangedEvent#getType}.
      */
     public enum DatasetEventType {
+        /**
+         * A combination of multiple events
+         */
         DATA_CHANGED,
+        /**
+         * The lat/lon coordinates of a node have changed.
+         */
         NODE_MOVED,
+        /**
+         * Primitives have been added to this dataset
+         */
         PRIMITIVES_ADDED,
+        /**
+         * Primitives have been removed from this dataset
+         */
         PRIMITIVES_REMOVED,
+        /**
+         * The members of a relation have changed
+         */
         RELATION_MEMBERS_CHANGED,
+        /**
+         * The tags of a primitve have changed
+         */
         TAGS_CHANGED,
+        /**
+         * The nodes of a way or their order has changed
+         */
         WAY_NODES_CHANGED,
+        /**
+         * The changeset id changed for a list of primitives
+         */
         CHANGESET_ID_CHANGED,
+        /**
+         * The flags changed for a primitive and have not been covered in an other event
+         */
         PRIMITIVE_FLAGS_CHANGED,
     }
 
diff --git a/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
index 155a53d..9d5dbc8 100644
--- a/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
@@ -6,6 +6,9 @@ import java.util.List;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * An event that is triggered when the changeset id has changed for a list of primitives.
+ */
 public class ChangesetIdChangedEvent extends AbstractDatasetChangedEvent {
 
     private final List<OsmPrimitive> primitives;
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
index f52a31b..acbcc45 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
@@ -8,6 +8,9 @@ import java.util.List;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * A combined data change event. It consists of multiple dataset events.
+ */
 public class DataChangedEvent extends AbstractDatasetChangedEvent {
 
     private final List<AbstractDatasetChangedEvent> events;
diff --git a/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java b/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
index 9ab7ce2..acb1d2e 100644
--- a/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
@@ -8,6 +8,9 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * An event that is triggered on a node move (lat/lon change)
+ */
 public class NodeMovedEvent extends AbstractDatasetChangedEvent {
 
     private final Node node;
diff --git a/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java b/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
index 306d96b..792e3c7 100644
--- a/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
@@ -9,6 +9,9 @@ import java.util.List;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * An event that is triggered if primitives have been added to the dataset
+ */
 public class PrimitivesAddedEvent extends AbstractDatasetChangedEvent {
 
     private final List<? extends OsmPrimitive> primitives;
diff --git a/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java b/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
index 6abb5af..ebb145c 100644
--- a/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
@@ -9,6 +9,9 @@ import java.util.List;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * An event that is triggered when primitives were removed from the dataset
+ */
 public class PrimitivesRemovedEvent extends AbstractDatasetChangedEvent {
 
     private final List<? extends OsmPrimitive> primitives;
diff --git a/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
index 161c40a..9b3c73c 100644
--- a/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
@@ -8,6 +8,9 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 
+/**
+ * An event that is triggered if the members of a single relation have changed
+ */
 public class RelationMembersChangedEvent extends AbstractDatasetChangedEvent {
 
     private final Relation relation;
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index f9f0bb6..14c4220 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -1,24 +1,35 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm.event;
 
-import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Stream;
 
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 
 /**
- * Similar like {@link DatasetEventManager}, just for selection events. Because currently selection changed
- * event are global, only FIRE_IN_EDT and FIRE_EDT_CONSOLIDATED modes are really useful
+ * Similar like {@link DatasetEventManager}, just for selection events.
+ *
+ * It allows to register listeners to global selection events for the selection in the current edit layer.
+ *
+ * If you want to listen to selections to a specific data layer,
+ * you can register a listener to that layer by using {@link DataSet#addSelectionListener(DataSelectionListener)}
+ *
  * @since 2912
  */
-public class SelectionEventManager implements SelectionChangedListener {
+public class SelectionEventManager implements DataSelectionListener, ActiveLayerChangeListener {
 
     private static final SelectionEventManager instance = new SelectionEventManager();
 
@@ -30,14 +41,49 @@ public class SelectionEventManager implements SelectionChangedListener {
         return instance;
     }
 
-    private static class ListenerInfo {
+    private interface ListenerInfo {
+        void fire(SelectionChangeEvent event);
+    }
+
+    private static class OldListenerInfo implements ListenerInfo {
         private final SelectionChangedListener listener;
 
-        ListenerInfo(SelectionChangedListener listener) {
+        OldListenerInfo(SelectionChangedListener listener) {
             this.listener = listener;
         }
 
         @Override
+        public void fire(SelectionChangeEvent event) {
+            listener.selectionChanged(event.getSelection());
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(listener);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            OldListenerInfo that = (OldListenerInfo) o;
+            return Objects.equals(listener, that.listener);
+        }
+    }
+
+    private static class DataListenerInfo implements ListenerInfo {
+        private final DataSelectionListener listener;
+
+        DataListenerInfo(DataSelectionListener listener) {
+            this.listener = listener;
+        }
+
+        @Override
+        public void fire(SelectionChangeEvent event) {
+            listener.selectionChanged(event);
+        }
+
+        @Override
         public int hashCode() {
             return Objects.hash(listener);
         }
@@ -46,63 +92,125 @@ public class SelectionEventManager implements SelectionChangedListener {
         public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
-            ListenerInfo that = (ListenerInfo) o;
+            DataListenerInfo that = (DataListenerInfo) o;
             return Objects.equals(listener, that.listener);
         }
     }
 
-    private Collection<? extends OsmPrimitive> selection;
     private final CopyOnWriteArrayList<ListenerInfo> inEDTListeners = new CopyOnWriteArrayList<>();
-    private final CopyOnWriteArrayList<ListenerInfo> normalListeners = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<ListenerInfo> immedatelyListeners = new CopyOnWriteArrayList<>();
 
     /**
      * Constructs a new {@code SelectionEventManager}.
      */
-    public SelectionEventManager() {
-        DataSet.addSelectionListener(this);
+    protected SelectionEventManager() {
+        MainLayerManager layerManager = Main.getLayerManager();
+        // We do not allow for destructing this object.
+        // Currently, this is a singleton class, so this is not required.
+        layerManager.addAndFireActiveLayerChangeListener(this);
     }
 
     /**
      * Registers a new {@code SelectionChangedListener}.
+     *
+     * It is preferred to add a DataSelectionListener - that listener will receive more information about the event.
      * @param listener listener to add
-     * @param fireMode EDT firing mode
+     * @param fireMode Set this to IN_EDT_CONSOLIDATED if you want the event to be fired in the EDT thread.
+     *                 Set it to IMMEDIATELY if you want the event to fire in the thread that caused the selection update.
      */
     public void addSelectionListener(SelectionChangedListener listener, FireMode fireMode) {
-        if (fireMode == FireMode.IN_EDT)
+        if (fireMode == FireMode.IN_EDT) {
             throw new UnsupportedOperationException("IN_EDT mode not supported, you probably want to use IN_EDT_CONSOLIDATED.");
-        if (fireMode == FireMode.IN_EDT || fireMode == FireMode.IN_EDT_CONSOLIDATED) {
-            inEDTListeners.addIfAbsent(new ListenerInfo(listener));
+        } else if (fireMode == FireMode.IN_EDT_CONSOLIDATED) {
+            inEDTListeners.addIfAbsent(new OldListenerInfo(listener));
         } else {
-            normalListeners.addIfAbsent(new ListenerInfo(listener));
+            immedatelyListeners.addIfAbsent(new OldListenerInfo(listener));
         }
     }
 
     /**
+     * Adds a selection listener that gets notified for selections immediately.
+     * @param listener The listener to add.
+     * @since 12098
+     */
+    public void addSelectionListener(DataSelectionListener listener) {
+        immedatelyListeners.addIfAbsent(new DataListenerInfo(listener));
+    }
+
+    /**
+     * Adds a selection listener that gets notified for selections later in the EDT thread.
+     * Events are sent in the right order but may be delayed.
+     * @param listener The listener to add.
+     * @since 12098
+     */
+    public void addSelectionListenerForEdt(DataSelectionListener listener) {
+        inEDTListeners.addIfAbsent(new DataListenerInfo(listener));
+    }
+
+    /**
      * Unregisters a {@code SelectionChangedListener}.
      * @param listener listener to remove
      */
     public void removeSelectionListener(SelectionChangedListener listener) {
-        ListenerInfo searchListener = new ListenerInfo(listener);
+        remove(new OldListenerInfo(listener));
+    }
+
+    /**
+     * Unregisters a {@code DataSelectionListener}.
+     * @param listener listener to remove
+     * @since 12098
+     */
+    public void removeSelectionListener(DataSelectionListener listener) {
+        remove(new DataListenerInfo(listener));
+    }
+
+    private void remove(ListenerInfo searchListener) {
         inEDTListeners.remove(searchListener);
-        normalListeners.remove(searchListener);
+        immedatelyListeners.remove(searchListener);
+    }
+
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        DataSet oldDataSet = e.getPreviousEditDataSet();
+        if (oldDataSet != null) {
+            // Fake a selection removal
+            // Relying on this allows components to not have to monitor layer changes.
+            // If we would not do this, e.g. the move command would have a hard time tracking which layer
+            // the last moved selection was in.
+            SelectionReplaceEvent event = new SelectionReplaceEvent(oldDataSet,
+                    new HashSet<>(oldDataSet.getAllSelected()), Stream.empty());
+            selectionChanged(event);
+            oldDataSet.removeSelectionListener(this);
+        }
+        DataSet newDataSet = e.getSource().getEditDataSet();
+        if (newDataSet != null) {
+            newDataSet.addSelectionListener(this);
+            // Fake a selection add
+            SelectionReplaceEvent event = new SelectionReplaceEvent(newDataSet,
+                    Collections.emptySet(), newDataSet.getAllSelected().stream());
+            selectionChanged(event);
+        }
     }
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        fireEvents(normalListeners, newSelection);
-        selection = newSelection;
-        SwingUtilities.invokeLater(edtRunnable);
+    public void selectionChanged(SelectionChangeEvent event) {
+        fireEvent(immedatelyListeners, event);
+        SwingUtilities.invokeLater(() -> fireEvent(inEDTListeners, event));
     }
 
-    private static void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
+    private static void fireEvent(List<ListenerInfo> listeners, SelectionChangeEvent event) {
         for (ListenerInfo listener: listeners) {
-            listener.listener.selectionChanged(newSelection);
+            listener.fire(event);
         }
     }
 
-    private final Runnable edtRunnable = () -> {
-        if (selection != null) {
-            fireEvents(inEDTListeners, selection);
-        }
-    };
+    /**
+     * Only to be used during unit tests, to reset the state. Do not use it in plugins/other code.
+     * Called after the layer manager was reset by the test framework.
+     */
+    public void resetState() {
+        inEDTListeners.clear();
+        immedatelyListeners.clear();
+        Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
index 564a7cf..1935746 100644
--- a/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
@@ -8,6 +8,9 @@ import java.util.Map;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * An event that is triggered if the tags of a single primitive have changed
+ */
 public class TagsChangedEvent extends AbstractDatasetChangedEvent {
 
     private final OsmPrimitive primitive;
diff --git a/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
index 1318cdd..5b343a2 100644
--- a/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
@@ -8,6 +8,9 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * An event that is triggered when the nodes of a way have been changed (nodes added, removed or the order was changed)
+ */
 public class WayNodesChangedEvent extends AbstractDatasetChangedEvent {
 
     private final Way way;
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
index 6da567a..491e377 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
@@ -59,12 +59,20 @@ public class HistoryDataSet implements LayerChangeListener {
         changesets = new HashMap<>();
     }
 
+    /**
+     * Adds a listener that listens to history data set events.
+     * @param listener The listener
+     */
     public void addHistoryDataSetListener(HistoryDataSetListener listener) {
         if (listener != null) {
             listeners.addIfAbsent(listener);
         }
     }
 
+    /**
+     * Removes a listener that listens to history data set events.
+     * @param listener The listener
+     */
     public void removeHistoryDataSetListener(HistoryDataSetListener listener) {
         listeners.remove(listener);
     }
@@ -188,6 +196,10 @@ public class HistoryDataSet implements LayerChangeListener {
         fireHistoryUpdated(null);
     }
 
+    /**
+     * Gets a unsorted set of all changeset ids that were used by the primitives in this data set
+     * @return The ids
+     */
     public Collection<Long> getChangesetIds() {
         final Set<Long> ids = new HashSet<>();
         for (Collection<HistoryOsmPrimitive> i : data.values()) {
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java
index 89a2ec6..f1f685d 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java
@@ -3,6 +3,10 @@ package org.openstreetmap.josm.data.osm.history;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 
+/**
+ * A listener that listens to changes in the {@link HistoryDataSet}.
+ * @see HistoryDataSet#addHistoryDataSetListener(HistoryDataSetListener)
+ */
 public interface HistoryDataSetListener {
     /**
      * Fired by a {@link HistoryDataSet} if the cached history of an OSM primitive with
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
index 553e85b..46ef73b 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
@@ -6,8 +6,8 @@ import java.util.Collection;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -26,7 +26,7 @@ public class BoundingXYVisitor extends AbstractVisitor {
 
     @Override
     public void visit(Node n) {
-        visit(n.getEastNorth());
+        visit((ILatLon) n);
     }
 
     @Override
@@ -74,14 +74,14 @@ public class BoundingXYVisitor extends AbstractVisitor {
      */
     public void visit(LatLon latlon) {
         if (latlon != null) {
-            if (latlon instanceof CachedLatLon) {
-                visit(((CachedLatLon) latlon).getEastNorth());
-            } else {
-                visit(Main.getProjection().latlon2eastNorth(latlon));
-            }
+            visit((ILatLon) latlon);
         }
     }
 
+    private void visit(ILatLon latlon) {
+        visit(latlon.getEastNorth());
+    }
+
     /**
      * Visiting call for east/north.
      * @param eastNorth east/north
@@ -133,13 +133,12 @@ public class BoundingXYVisitor extends AbstractVisitor {
             return;
         LatLon minLatlon = Main.getProjection().eastNorth2latlon(bounds.getMin());
         LatLon maxLatlon = Main.getProjection().eastNorth2latlon(bounds.getMax());
-        bounds = new ProjectionBounds(
-                Main.getProjection().latlon2eastNorth(new LatLon(
+        bounds = new ProjectionBounds(new LatLon(
                         Math.max(-90, minLatlon.lat() - enlargeDegree),
-                        Math.max(-180, minLatlon.lon() - enlargeDegree))),
-                Main.getProjection().latlon2eastNorth(new LatLon(
+                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(),
+                new LatLon(
                         Math.min(90, maxLatlon.lat() + enlargeDegree),
-                        Math.min(180, maxLatlon.lon() + enlargeDegree))));
+                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth());
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
index 7f99f0f..3322d7f 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
@@ -48,4 +48,13 @@ public class ArrowPaintHelper {
             path.lineTo(x + dx * cos + dy * -sin, y + dx * sin + dy * cos);
         }
     }
+
+    /**
+     * Gets the length of the arrow along the line segment.
+     * @return the length along the line
+     * @since 12154
+     */
+    public double getOnLineLength() {
+        return length * cos;
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
index cd2378f..45d991a 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
@@ -43,40 +43,77 @@ public final class MapRendererFactory {
      */
     public static final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name";
 
+    /**
+     * An exception thrown while creating a map renderer
+     */
     public static class MapRendererFactoryException extends RuntimeException {
 
+        /**
+         * Create a new {@link MapRendererFactoryException}
+         * @param message The message
+         * @param cause The cause
+         */
         public MapRendererFactoryException(String message, Throwable cause) {
             super(message, cause);
         }
 
+        /**
+         * Create a new {@link MapRendererFactoryException}
+         * @param message The message
+         */
         public MapRendererFactoryException(String message) {
             super(message);
         }
 
+        /**
+         * Create a new {@link MapRendererFactoryException}
+         * @param cause The cause
+         */
         public MapRendererFactoryException(Throwable cause) {
             super(cause);
         }
     }
 
+    /**
+     * A description of a possible renderer for the map
+     */
     public static class Descriptor {
         private final Class<? extends AbstractMapRenderer> renderer;
         private final String displayName;
         private final String description;
 
+        /**
+         * Creates a new map renderer description
+         * @param renderer The renderer
+         * @param displayName The display name for the renderer
+         * @param description The longer description that should be displayed to the user.
+         */
         public Descriptor(Class<? extends AbstractMapRenderer> renderer, String displayName, String description) {
             this.renderer = renderer;
             this.displayName = displayName;
             this.description = description;
         }
 
+        /**
+         * Get the class of the renderer
+         * @return The class
+         */
         public Class<? extends AbstractMapRenderer> getRenderer() {
             return renderer;
         }
 
+        /**
+         * Get the display name
+         * @return The name
+         */
         public String getDisplayName() {
             return displayName;
         }
 
+        /**
+         * Get the description
+         * @return The description
+         */
         public String getDescription() {
             return description;
         }
@@ -267,11 +304,11 @@ public final class MapRendererFactory {
         try {
             Constructor<?> c = activeRenderer.getConstructor(new Class<?>[]{Graphics2D.class, NavigatableComponent.class, boolean.class});
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
-        } catch (NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException e) {
-            throw new MapRendererFactoryException(e);
         } catch (InvocationTargetException e) {
             Main.debug(e);
             throw new MapRendererFactoryException(e.getCause());
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
+            throw new MapRendererFactoryException(e);
         }
     }
 
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 8438744..c527180 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -79,6 +80,7 @@ import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.AreaAndPerimeter;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -98,40 +100,70 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         private final StyleElement style;
         private final OsmPrimitive osm;
         private final int flags;
+        private final long order;
 
         StyleRecord(StyleElement style, OsmPrimitive osm, int flags) {
             this.style = style;
             this.osm = osm;
             this.flags = flags;
-        }
 
-        @Override
-        public int compareTo(StyleRecord other) {
-            if ((this.flags & FLAG_DISABLED) != 0 && (other.flags & FLAG_DISABLED) == 0)
-                return -1;
-            if ((this.flags & FLAG_DISABLED) == 0 && (other.flags & FLAG_DISABLED) != 0)
-                return 1;
+            long order = 0;
+            if ((this.flags & FLAG_DISABLED) == 0) {
+                order |= 1;
+            }
 
-            int d0 = Float.compare(this.style.majorZIndex, other.style.majorZIndex);
-            if (d0 != 0)
-                return d0;
+            order <<= 24;
+            order |= floatToFixed(this.style.majorZIndex, 24);
 
             // selected on top of member of selected on top of unselected
-            // FLAG_DISABLED bit is the same at this point
-            if (this.flags > other.flags)
-                return 1;
-            if (this.flags < other.flags)
-                return -1;
+            // FLAG_DISABLED bit is the same at this point, but we simply ignore it
+            order <<= 4;
+            order |= this.flags & 0xf;
 
-            int dz = Float.compare(this.style.zIndex, other.style.zIndex);
-            if (dz != 0)
-                return dz;
+            order <<= 24;
+            order |= floatToFixed(this.style.zIndex, 24);
 
+            order <<= 1;
             // simple node on top of icons and shapes
-            if (NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(this.style) && !NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(other.style))
-                return 1;
-            if (!NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(this.style) && NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(other.style))
-                return -1;
+            if (NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(this.style)) {
+                order |= 1;
+            }
+
+            this.order = order;
+        }
+
+        /**
+         * Converts a float to a fixed point decimal so that the order stays the same.
+         *
+         * @param number The float to convert
+         * @param totalBits
+         *            Total number of bits. 1 sign bit. There should be at least 15 bits.
+         * @return The float converted to an integer.
+         */
+        protected static long floatToFixed(float number, int totalBits) {
+            long value = Float.floatToIntBits(number) & 0xffffffffL;
+
+            boolean negative = (value & 0x80000000L) != 0;
+            // Invert the sign bit, so that negative numbers are lower
+            value ^= 0x80000000L;
+            // Now do the shift. Do it before accounting for negative numbers (symetry)
+            if (totalBits < 32) {
+                value >>= (32 - totalBits);
+            }
+            // positive numbers are sorted now. Negative ones the wrong way.
+            if (negative) {
+                // Negative number: re-map it
+                value = (1L << (totalBits - 1)) - value;
+            }
+            return value;
+        }
+
+        @Override
+        public int compareTo(StyleRecord other) {
+            int d = Long.compare(order, other.order);
+            if (d != 0) {
+                return d;
+            }
 
             // newer primitives to the front
             long id = this.osm.getUniqueId() - other.osm.getUniqueId();
@@ -253,7 +285,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
      */
     static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
 
-    private static final double PHI = Math.toRadians(20);
+    private static final double PHI = Utils.toRadians(20);
     private static final double cosPHI = Math.cos(PHI);
     private static final double sinPHI = Math.sin(PHI);
     /**
@@ -945,7 +977,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         } else {
             fromAngle = Math.atan(dy / dx);
         }
-        double fromAngleDeg = Math.toDegrees(fromAngle);
+        double fromAngleDeg = Utils.toDegrees(fromAngle);
 
         double vx = distanceFromVia * Math.cos(fromAngle);
         double vy = distanceFromVia * Math.sin(fromAngle);
@@ -968,41 +1000,41 @@ public class StyledMapRenderer extends AbstractMapRenderer {
 
         if (pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg - 90));
             } else {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 90));
             }
             iconAngle = 270+fromAngleDeg;
         }
         if (pFrom.x < pVia.x && pFrom.y >= pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg));
             } else {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 180));
             }
             iconAngle = 90-fromAngleDeg;
         }
         if (pFrom.x < pVia.x && pFrom.y < pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 90));
             } else {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg - 90));
             }
             iconAngle = 90+fromAngleDeg;
         }
         if (pFrom.x >= pVia.x && pFrom.y < pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 180));
             } else {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg));
             }
             iconAngle = 270-fromAngleDeg;
         }
@@ -1189,6 +1221,10 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         MapViewPoint lastPoint = null;
         Iterator<MapViewPoint> it = new OffsetIterator(mapState, wayNodes, offset);
         boolean initialMoveToNeeded = true;
+        ArrowPaintHelper drawArrowHelper = null;
+        if (showOrientation) {
+            drawArrowHelper = new ArrowPaintHelper(PHI, 10 + line.getLineWidth());
+        }
         while (it.hasNext()) {
             MapViewPoint p = it.next();
             if (lastPoint != null) {
@@ -1202,10 +1238,17 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                 path.lineTo(p2);
 
                 /* draw arrow */
-                if (showHeadArrowOnly ? !it.hasNext() : showOrientation) {
-                    //TODO: Cache
-                    ArrowPaintHelper drawHelper = new ArrowPaintHelper(PHI, 10 + line.getLineWidth());
-                    drawHelper.paintArrowAt(orientationArrows, p2, p1);
+                if (drawArrowHelper != null) {
+                    boolean drawArrow;
+                    // always draw last arrow - no matter how short the segment is
+                    drawArrow = !it.hasNext();
+                    if (!showHeadArrowOnly) {
+                        // draw arrows in between only if there is enough space
+                        drawArrow = drawArrow || p1.distanceToInView(p2) > drawArrowHelper.getOnLineLength() * 1.3;
+                    }
+                    if (drawArrow) {
+                        drawArrowHelper.paintArrowAt(orientationArrows, p2, p1);
+                    }
                 }
             }
             lastPoint = p;
@@ -1498,7 +1541,23 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         BBox bbox = bounds.toBBox();
         getSettings(renderVirtualNodes);
 
-        data.getReadLock().lock();
+        try {
+            if (data.getReadLock().tryLock(1, TimeUnit.SECONDS)) {
+                try {
+                    paintWithLock(data, renderVirtualNodes, benchmark, bbox);
+                } finally {
+                    data.getReadLock().unlock();
+                }
+            } else {
+                Logging.warn("Cannot paint layer {0}: It is locked.");
+            }
+        } catch (InterruptedException e) {
+            Logging.warn("Cannot paint layer {0}: Interrupted");
+        }
+    }
+
+    private void paintWithLock(final DataSet data, boolean renderVirtualNodes, RenderBenchmarkCollector benchmark,
+            BBox bbox) {
         try {
             highlightWaySegments = data.getHighlightedWaySegments();
 
@@ -1544,8 +1603,6 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                     .put("scale", scale)
                     .put("paintSettings", paintSettings)
                     .put("renderVirtualNodes", renderVirtualNodes);
-        } finally {
-            data.getReadLock().unlock();
         }
     }
 
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
index 68ea2b8..88d0e16 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
@@ -31,6 +31,7 @@ import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.draw.MapPath2D;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * A map renderer that paints a simple scheme of every primitive it visits to a
@@ -89,7 +90,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
     private DataSet ds;
 
     /** Helper variable for {@link #drawSegment} */
-    private static final ArrowPaintHelper ARROW_PAINT_HELPER = new ArrowPaintHelper(Math.toRadians(20), 10);
+    private static final ArrowPaintHelper ARROW_PAINT_HELPER = new ArrowPaintHelper(Utils.toRadians(20), 10);
 
     /** Helper variable for {@link #visit(Relation)} */
     private final Stroke relatedWayStroke = new BasicStroke(
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
index 34eb76b..28a08ae 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
@@ -246,10 +246,26 @@ public class Multipolygon {
         }
     }
 
+    /**
+     * The polygon data for a multipolygon part.
+     * It contains the outline of this polygon in east/north space.
+     */
     public static class PolyData extends JoinedWay {
+        /**
+         * The intersection type used for {@link PolyData#contains(java.awt.geom.Path2D.Double)}
+         */
         public enum Intersection {
+            /**
+             * The polygon is completely inside this PolyData
+             */
             INSIDE,
+            /**
+             * The polygon is completely outside of this PolyData
+             */
             OUTSIDE,
+            /**
+             * The polygon is partially inside and outside of this PolyData
+             */
             CROSSING
         }
 
@@ -312,6 +328,11 @@ public class Multipolygon {
             }
         }
 
+        /**
+         * Checks if this multipolygon contains or crosses an other polygon
+         * @param p The path to check. Needs to be in east/north space.
+         * @return a {@link Intersection} constant
+         */
         public Intersection contains(Path2D.Double p) {
             int contains = 0;
             int total = 0;
@@ -333,6 +354,10 @@ public class Multipolygon {
             return Intersection.CROSSING;
         }
 
+        /**
+         * Adds an inner polygon
+         * @param inner The polygon to add as inner polygon.
+         */
         public void addInner(PolyData inner) {
             inners.add(inner);
             appendInner(inner.poly);
@@ -342,10 +367,18 @@ public class Multipolygon {
             poly.append(inner.getPathIterator(null), false);
         }
 
+        /**
+         * Gets the polygon outline and interior as java path
+         * @return The path in east/north space.
+         */
         public Path2D.Double get() {
             return poly;
         }
 
+        /**
+         * Gets the bounds as {@link Rectangle2D} in east/north space.
+         * @return The bounds
+         */
         public Rectangle2D getBounds() {
             if (bounds == null) {
                 bounds = poly.getBounds2D();
@@ -353,6 +386,10 @@ public class Multipolygon {
             return bounds;
         }
 
+        /**
+         * Gets a list of all inner polygons.
+         * @return The inner polygons.
+         */
         public List<PolyData> getInners() {
             return Collections.unmodifiableList(inners);
         }
@@ -394,6 +431,10 @@ public class Multipolygon {
             bounds = null;
         }
 
+        /**
+         * Check if this polygon was changed by a node move
+         * @param event The node move event
+         */
         public void nodeMoved(NodeMovedEvent event) {
             final Node n = event.getNode();
             boolean innerChanged = false;
@@ -408,6 +449,10 @@ public class Multipolygon {
             }
         }
 
+        /**
+         * Check if this polygon was affected by a way change
+         * @param event The way event
+         */
         public void wayNodesChanged(WayNodesChangedEvent event) {
             final Long wayId = event.getChangedWay().getUniqueId();
             boolean innerChanged = false;
@@ -525,6 +570,11 @@ public class Multipolygon {
         }
     }
 
+    /**
+     * Attempt to combine the ways in the list if they share common end nodes
+     * @param waysToJoin The ways to join
+     * @return A collection of {@link JoinedWay} objects indicating the possible join of those ways
+     */
     public static Collection<JoinedWay> joinWays(Collection<Way> waysToJoin) {
         final Collection<JoinedWay> result = new ArrayList<>();
         final Way[] joinArray = waysToJoin.toArray(new Way[waysToJoin.size()]);
@@ -620,6 +670,12 @@ public class Multipolygon {
         return result;
     }
 
+    /**
+     * Find a matching outer polygon for the inner one
+     * @param inner The inner polygon to search the outer for
+     * @param outerPolygons The possible outer polygons
+     * @return The outer polygon that was found or <code>null</code> if none was found.
+     */
     public PolyData findOuterPolygon(PolyData inner, List<PolyData> outerPolygons) {
         // First try to test only bbox, use precise testing only if we don't get unique result
         Rectangle2D innerBox = inner.getBounds();
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
index 956187a..740429a 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
@@ -5,6 +5,8 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.tools.ListenableWeakReference;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
  * Captures the common functionality of preference properties
@@ -236,7 +238,11 @@ public abstract class AbstractProperty<T> {
      * @since 10824
      */
     public void addListener(ValueChangeListener<? super T> listener) {
-        addListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        try {
+            addListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 
     protected void addListenerImpl(PreferenceChangedListener adapter) {
@@ -249,11 +255,38 @@ public abstract class AbstractProperty<T> {
      * @since 10824
      */
     public void addWeakListener(ValueChangeListener<? super T> listener) {
-        addWeakListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        try {
+            ValueChangeListener<T> weakListener = new WeakPreferenceAdapter(listener);
+            PreferenceChangedListenerAdapter adapter = new PreferenceChangedListenerAdapter(weakListener);
+            addListenerImpl(adapter);
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 
-    protected void addWeakListenerImpl(PreferenceChangedListener adapter) {
-        getPreferences().addWeakKeyPreferenceChangeListener(getKey(), adapter);
+    /**
+     * This class wraps the ValueChangeListener in a ListenableWeakReference that automatically removes itself
+     * if the listener is garbage collected.
+     * @author Michael Zangl
+     */
+    private class WeakPreferenceAdapter extends ListenableWeakReference<ValueChangeListener<? super T>>
+            implements ValueChangeListener<T> {
+        WeakPreferenceAdapter(ValueChangeListener<? super T> referent) {
+            super(referent);
+        }
+
+        @Override
+        public void valueChanged(ValueChangeEvent<? extends T> e) {
+            ValueChangeListener<? super T> r = super.get();
+            if (r != null) {
+                r.valueChanged(e);
+            }
+        }
+
+        @Override
+        protected void onDereference() {
+            removeListenerImpl(new PreferenceChangedListenerAdapter(this));
+        }
     }
 
     /**
@@ -262,7 +295,11 @@ public abstract class AbstractProperty<T> {
      * @since 10824
      */
     public void removeListener(ValueChangeListener<? super T> listener) {
-        removeListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        try {
+            removeListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 
     protected void removeListenerImpl(PreferenceChangedListener adapter) {
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
index 1ac7e18..307b325 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
@@ -59,12 +59,6 @@ public abstract class AbstractToStringProperty<T> extends AbstractProperty<T> {
         }
 
         @Override
-        protected void addWeakListenerImpl(PreferenceChangedListener adapter) {
-            super.addWeakListenerImpl(adapter);
-            parent.addWeakListenerImpl(adapter);
-        }
-
-        @Override
         protected void removeListenerImpl(PreferenceChangedListener adapter) {
             super.removeListenerImpl(adapter);
             parent.removeListenerImpl(adapter);
diff --git a/src/org/openstreetmap/josm/data/preferences/CachingProperty.java b/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
index 4a0235c..8e03e6a 100644
--- a/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
@@ -38,7 +38,7 @@ public class CachingProperty<T> extends AbstractProperty<T> implements ValueChan
 
     @Override
     public boolean put(T value) {
-        return toCache.put(cache);
+        return toCache.put(value);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
index f650743..33df77c 100644
--- a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
@@ -9,6 +9,7 @@ import java.util.function.DoubleUnaryOperator;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.datum.Datum;
 import org.openstreetmap.josm.data.projection.proj.Proj;
@@ -113,20 +114,22 @@ public abstract class AbstractProjection implements Projection {
     }
 
     @Override
-    public EastNorth latlon2eastNorth(LatLon ll) {
-        ll = datum.fromWGS84(ll);
+    public EastNorth latlon2eastNorth(ILatLon toConvert) {
+        // TODO: Use ILatLon in datum, so we don't need to wrap it here.
+        LatLon ll = datum.fromWGS84(new LatLon(toConvert));
         double[] en = proj.project(Utils.toRadians(ll.lat()), Utils.toRadians(LatLon.normalizeLon(ll.lon() - lon0 - pm)));
         return new EastNorth((ellps.a * k0 * en[0] + x0) / toMeter, (ellps.a * k0 * en[1] + y0) / toMeter);
     }
 
     @Override
     public LatLon eastNorth2latlon(EastNorth en) {
+        // We know it is a latlon. Nice would be to change this method return type to ILatLon
         return eastNorth2latlon(en, LatLon::normalizeLon);
     }
 
     @Override
     public LatLon eastNorth2latlonClamped(EastNorth en) {
-        LatLon ll = eastNorth2latlon(en, lon -> Utils.clamp(lon, -180, 180));
+        ILatLon ll = eastNorth2latlon(en, lon -> Utils.clamp(lon, -180, 180));
         Bounds bounds = getWorldBoundsLatLon();
         return new LatLon(Utils.clamp(ll.lat(), bounds.getMinLat(), bounds.getMaxLat()),
                 Utils.clamp(ll.lon(), bounds.getMinLon(), bounds.getMaxLon()));
@@ -168,7 +171,7 @@ public abstract class AbstractProjection implements Projection {
     @Override
     public double getDefaultZoomInPPD() {
         // this will set the map scaler to about 1000 m
-        return 10;
+        return 10 / getMetersPerUnit();
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/data/projection/CustomProjection.java b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
index a6a4b9c..1aa4c2c 100644
--- a/src/org/openstreetmap/josm/data/projection/CustomProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
@@ -705,7 +705,12 @@ public class CustomProjection extends AbstractProjection {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     * @deprecated unused - remove in 2017-07
+     */
     @Override
+    @Deprecated
     public String getCacheDirectoryName() {
         if (cacheDir != null) {
             return cacheDir;
diff --git a/src/org/openstreetmap/josm/data/projection/Projecting.java b/src/org/openstreetmap/josm/data/projection/Projecting.java
index 80d0101..226fd63 100644
--- a/src/org/openstreetmap/josm/data/projection/Projecting.java
+++ b/src/org/openstreetmap/josm/data/projection/Projecting.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -18,11 +19,26 @@ public interface Projecting {
 
     /**
      * Convert from lat/lon to easting/northing.
+     * <p>
+     * This method exists to not break binary compatibility with old plugins
      *
      * @param ll the geographical point to convert (in WGS84 lat/lon)
      * @return the corresponding east/north coordinates
+     * @see ILatLon#getEastNorth(Projecting)
      */
-    EastNorth latlon2eastNorth(LatLon ll);
+    default EastNorth latlon2eastNorth(LatLon ll) {
+        return latlon2eastNorth((ILatLon) ll);
+    }
+
+    /**
+     * Convert from lat/lon to easting/northing. This method uses the newer {@link ILatLon} interface.
+     *
+     * @param ll the geographical point to convert (in WGS84 lat/lon)
+     * @return the corresponding east/north coordinates
+     * @see ILatLon#getEastNorth(Projecting) as shorthand.
+     * @since 12161
+     */
+    EastNorth latlon2eastNorth(ILatLon ll);
 
     /**
      * Convert a east/north coordinate to the {@link LatLon} coordinate.
@@ -34,6 +50,7 @@ public interface Projecting {
 
     /**
      * Gets the base projection instance used.
+     * This may be the same as this one or a different one if this one is translated in east/north space.
      * @return The projection.
      */
     Projection getBaseProjection();
@@ -47,4 +64,13 @@ public interface Projecting {
      * @return a map of non-overlapping {@link ProjectionBounds} instances mapped to the {@link Projecting} object to use for that area.
      */
     Map<ProjectionBounds, Projecting> getProjectingsForArea(ProjectionBounds area);
+
+    /**
+     * Gets the object used as cache identifier when caching results of this projection.
+     * @return The object to use as cache key
+     * @since 10827
+     */
+    default Object getCacheKey() {
+        return this;
+    }
 }
diff --git a/src/org/openstreetmap/josm/data/projection/Projection.java b/src/org/openstreetmap/josm/data/projection/Projection.java
index f1168ba..8f597f9 100644
--- a/src/org/openstreetmap/josm/data/projection/Projection.java
+++ b/src/org/openstreetmap/josm/data/projection/Projection.java
@@ -53,7 +53,9 @@ public interface Projection extends Projecting {
     /**
      * Get a filename compatible string (for the cache directory).
      * @return the cache directory name (base name)
+     * @deprecated unused - remove in 2017-07
      */
+    @Deprecated
     String getCacheDirectoryName();
 
     /**
@@ -118,13 +120,4 @@ public interface Projection extends Projecting {
      * @return true if natural order of coordinates is North East, false if East North
      */
     boolean switchXY();
-
-    /**
-     * Gets the object used as cache identifier when caching results of this projection.
-     * @return The object to use as cache key
-     * @since 10827
-     */
-    default Object getCacheKey() {
-        return this;
-    }
 }
diff --git a/src/org/openstreetmap/josm/data/projection/ShiftedProjecting.java b/src/org/openstreetmap/josm/data/projection/ShiftedProjecting.java
index 3b30174..6638263 100644
--- a/src/org/openstreetmap/josm/data/projection/ShiftedProjecting.java
+++ b/src/org/openstreetmap/josm/data/projection/ShiftedProjecting.java
@@ -6,6 +6,7 @@ import java.util.Map;
 
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -28,7 +29,7 @@ public class ShiftedProjecting implements Projecting {
     }
 
     @Override
-    public EastNorth latlon2eastNorth(LatLon ll) {
+    public EastNorth latlon2eastNorth(ILatLon ll) {
         return base.latlon2eastNorth(ll).add(offset);
     }
 
diff --git a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
index ae6086b..d239608 100644
--- a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.data.validation;
 
 import java.awt.Color;
-import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Point;
 import java.util.HashSet;
 import java.util.List;
@@ -17,6 +17,9 @@ import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.draw.MapViewPath;
+import org.openstreetmap.josm.gui.draw.SymbolShape;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Visitor that highlights the primitives affected by an error
@@ -25,7 +28,7 @@ import org.openstreetmap.josm.gui.MapView;
  */
 public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
     /** The graphics */
-    private final Graphics g;
+    private final Graphics2D g;
     /** The MapView */
     private final MapView mv;
 
@@ -42,7 +45,7 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
      * @param g The graphics
      * @param mv The Mapview
      */
-    public PaintVisitor(Graphics g, MapView mv) {
+    public PaintVisitor(Graphics2D g, MapView mv) {
         this.g = g;
         this.mv = mv;
     }
@@ -119,14 +122,14 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
         PaintedPoint pp = new PaintedPoint(n.getCoor(), color);
 
         if (!paintedPoints.contains(pp)) {
-            Point p = mv.getPoint(n);
+            MapViewPath circle = new MapViewPath(mv.getState()).shapeAround(n, SymbolShape.CIRCLE, 10);
 
             if (selected) {
                 g.setColor(getHighlightColor(color));
-                g.fillOval(p.x - 5, p.y - 5, 10, 10);
+                g.fill(circle);
             }
             g.setColor(color);
-            g.drawOval(p.x - 5, p.y - 5, 10, 10);
+            g.draw(circle);
             paintedPoints.add(pp);
         }
     }
@@ -143,7 +146,7 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
         double t = Math.atan2((double) p2.x - p1.x, (double) p2.y - p1.y);
         double cosT = 5 * Math.cos(t);
         double sinT = 5 * Math.sin(t);
-        int deg = (int) Math.toDegrees(t);
+        int deg = (int) Utils.toDegrees(t);
         if (selected) {
             g.setColor(getHighlightColor(color));
             int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT),
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index ec90b16..df6bce7 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -295,7 +295,7 @@ public final class DomainValidator extends AbstractValidator {
 
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
     private static final String[] GENERIC_TLDS = new String[] {
-        // Taken from Version 2017040800, Last Updated Sat Apr  8 07:07:01 2017 UTC
+        // Taken from Version 2017052400, Last Updated Wed May 24 07:07:02 2017 UTC
         "aaa", // aaa American Automobile Association, Inc.
         "aarp", // aarp AARP
         "abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -353,6 +353,7 @@ public final class DomainValidator extends AbstractValidator {
         "app", // app Charleston Road Registry Inc.
         "apple", // apple Apple Inc.
         "aquarelle", // aquarelle Aquarelle.com
+        "arab", // arab League of Arab States
         "aramco", // aramco Aramco Services Company
         "archi", // archi STARTING DOT LIMITED
         "army", // army United TLD Holdco Ltd.
@@ -989,7 +990,6 @@ public final class DomainValidator extends AbstractValidator {
         "movistar", // movistar Telefónica S.A.
         "msd", // msd MSD Registry Holdings, Inc.
         "mtn", // mtn MTN Dubai Limited
-        "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
@@ -1491,6 +1491,7 @@ public final class DomainValidator extends AbstractValidator {
         "xn--mxtq1m", // 政府 Net-Chinese Co., Ltd.
         "xn--ngbc5azd", // شبكة International Domain Registry Pty. Ltd.
         "xn--ngbe9e0a", // بيتك Kuwait Finance House
+        "xn--ngbrx", // عرب League of Arab States
         "xn--nqv7f", // 机构 Public Interest Registry
         "xn--nqv7fs00ema", // 组织机构 Public Interest Registry
         "xn--nyqy26a", // 健康 Stable Tone Limited
diff --git a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
index 8b2238c..58806a5 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
@@ -126,16 +126,16 @@ public class LongSegment extends Test {
 
     @Override
     public boolean isPrimitiveUsable(OsmPrimitive p) {
-        if (!p.isUsable()) {
-            return false;
-        } else if (p instanceof Way && ((Way) p).getNodesCount() > 1) {
-            // test only Ways with at least 2 nodes
-            return true;
-        } else if (p instanceof Node && p.isDrawable()) {
-            // test all nodes - ways referred by them may not be checked automatically.
-            return true;
-        } else {
-            return false;
-        }
+        return p.isUsable() && (isUsableWay(p) || isUsableNode(p));
+    }
+
+    private static boolean isUsableNode(OsmPrimitive p) {
+        // test changed nodes - ways referred by them may not be checked automatically.
+        return p instanceof Node && p.isDrawable();
+    }
+
+    private static boolean isUsableWay(OsmPrimitive p) {
+        // test only Ways with at least 2 nodes
+        return p instanceof Way && ((Way) p).getNodesCount() > 1;
     }
 }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index c3ee856..d60070f 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -68,8 +68,8 @@ public class TagChecker extends TagTest {
 
     /** Normalized keys: the key should be substituted by the value if the key was not found in presets */
     private static final Map<String, String> harmonizedKeys = new HashMap<>();
-    /** The spell check preset values */
-    private static volatile MultiMap<String, String> presetsValueData;
+    /** The spell check preset values which are not stored in TaggingPresets */
+    private static volatile MultiMap<String, String> additionalPresetsValueData;
     /** The TagChecker data */
     private static final List<CheckerData> checkerData = new ArrayList<>();
     private static final List<String> ignoreDataStartsWith = new ArrayList<>();
@@ -258,14 +258,14 @@ public class TagChecker extends TagTest {
 
         Collection<TaggingPreset> presets = TaggingPresets.getTaggingPresets();
         if (!presets.isEmpty()) {
-            presetsValueData = new MultiMap<>();
+            additionalPresetsValueData = new MultiMap<>();
             for (String a : OsmPrimitive.getUninterestingKeys()) {
-                presetsValueData.putVoid(a);
+                additionalPresetsValueData.putVoid(a);
             }
             // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
             for (String a : Main.pref.getCollection(ValidatorPreference.PREFIX + ".knownkeys",
                     Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"}))) {
-                presetsValueData.putVoid(a);
+                additionalPresetsValueData.putVoid(a);
             }
             for (TaggingPreset p : presets) {
                 for (TaggingPresetItem i : p.data) {
@@ -284,7 +284,6 @@ public class TagChecker extends TagTest {
     private static void addPresetValue(KeyedItem ky) {
         Collection<String> values = ky.getValues();
         if (ky.key != null && values != null) {
-            presetsValueData.putAll(ky.key, values);
             harmonizedKeys.put(harmonizeKey(ky.key), ky.key);
         }
     }
@@ -304,6 +303,13 @@ public class TagChecker extends TagTest {
         return false;
     }
 
+    private static Set<String> getPresetValues(String key) {
+        Set<String> res = TaggingPresets.getPresetValues(key);
+        if (res != null)
+            return res;
+        return additionalPresetsValueData.get(key);
+    }
+
     /**
      * Determines if the given key is in internal presets.
      * @param key key
@@ -311,7 +317,7 @@ public class TagChecker extends TagTest {
      * @since 9023
      */
     public static boolean isKeyInPresets(String key) {
-        return presetsValueData.get(key) != null;
+        return getPresetValues(key) != null;
     }
 
     /**
@@ -322,7 +328,7 @@ public class TagChecker extends TagTest {
      * @since 9023
      */
     public static boolean isTagInPresets(String key, String value) {
-        final Set<String> values = presetsValueData.get(key);
+        final Set<String> values = getPresetValues(key);
         return values != null && (values.isEmpty() || values.contains(value));
     }
 
@@ -461,7 +467,8 @@ public class TagChecker extends TagTest {
                         .build());
                 withErrors.put(p, "HTML");
             }
-            if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null && !isTagIgnored(key, value)) {
+            if (checkValues && key != null && value != null && !value.isEmpty() && additionalPresetsValueData != null
+                    && !isTagIgnored(key, value)) {
                 if (!isKeyInPresets(key)) {
                     String prettifiedKey = harmonizeKey(key);
                     String fixedKey = harmonizedKeys.get(prettifiedKey);
@@ -486,7 +493,7 @@ public class TagChecker extends TagTest {
                 } else if (!isTagInPresets(key, value)) {
                     // try to fix common typos and check again if value is still unknown
                     String fixedValue = harmonizeValue(prop.getValue());
-                    Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
+                    Map<String, String> possibleValues = getPossibleValues(getPresetValues(key));
                     if (possibleValues.containsKey(fixedValue)) {
                         final String newKey = possibleValues.get(fixedValue);
                         // misspelled preset value
@@ -754,10 +761,10 @@ public class TagChecker extends TagTest {
                         valueAll = true;
                     } else if ("BOOLEAN_TRUE".equals(n)) {
                         valueBool = true;
-                        value = OsmUtils.trueval;
+                        value = OsmUtils.TRUE_VALUE;
                     } else if ("BOOLEAN_FALSE".equals(n)) {
                         valueBool = true;
-                        value = OsmUtils.falseval;
+                        value = OsmUtils.FALSE_VALUE;
                     } else {
                         value = n.startsWith("/") ? getPattern(n) : n;
                     }
diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
index f284ec3..d9b95c0 100644
--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
@@ -32,6 +32,12 @@ import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.WikiReader;
 
+/**
+ * Panel that fills the main part of the program window when JOSM has just started.
+ * 
+ * It downloads and displays the so called <em>message of the day</em>, which
+ * contains news about recent major changes, warning in case of outdated versions, etc.
+ */
 public final class GettingStarted extends JPanel implements ProxyPreferenceListener {
 
     private final LinkGeneral lg;
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index 0ed2265..469e8a2 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -197,7 +197,7 @@ public class ImageryMenu extends JMenu implements LayerChangeListener {
         addDynamicSeparator();
         JMenu subMenu = Main.main.menu.imagerySubMenu;
         int heightUnrolled = 30*(getItemCount()+subMenu.getItemCount());
-        if (heightUnrolled < Main.panel.getHeight()) {
+        if (heightUnrolled < Main.main.panel.getHeight()) {
             // add all items of submenu if they will fit on screen
             int n = subMenu.getItemCount();
             for (int i = 0; i < n; i++) {
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 9572be6..fd6e6cb 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.net.ssl.SSLSocketFactory;
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.RepaintManager;
 import javax.swing.SwingUtilities;
@@ -87,7 +88,7 @@ public class MainApplication extends Main {
      */
     private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
 
-    private MainFrame mainFrame;
+    private final MainFrame mainFrame;
 
     /**
      * Constructs a new {@code MainApplication} without a window.
@@ -108,15 +109,17 @@ public class MainApplication extends Main {
 
     @Override
     protected void initializeMainWindow() {
-        mainPanel.reAddListeners();
         if (mainFrame != null) {
+            panel = mainFrame.getPanel();
             mainFrame.initialize();
-
             menu = mainFrame.getMenu();
         } else {
             // required for running some tests.
+            panel = new MainPanel(Main.getLayerManager());
             menu = new MainMenu();
         }
+        panel.addMapFrameListener((o, n) -> redoUndoListener.commandChanged(0, 0));
+        panel.reAddListeners();
     }
 
     @Override
@@ -206,8 +209,8 @@ public class MainApplication extends Main {
     public static void main(final String[] argArray) {
         I18n.init();
 
-        // construct argument table
         ProgramArguments args = null;
+        // construct argument table
         try {
             args = new ProgramArguments(argArray);
         } catch (IllegalArgumentException e) {
@@ -292,7 +295,11 @@ public class MainApplication extends Main {
         WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
                 args.getSingle(Option.GEOMETRY).orElse(null),
                 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
-        final MainFrame mainFrame = new MainFrame(contentPanePrivate, geometry);
+        final MainFrame mainFrame = new MainFrame(geometry);
+        if (mainFrame.getContentPane() instanceof JComponent) {
+            Main.contentPanePrivate = (JComponent) mainFrame.getContentPane();
+        }
+        Main.mainPanel = mainFrame.getPanel();
         Main.parent = mainFrame;
 
         if (args.hasOption(Option.LOAD_PREFERENCES)) {
@@ -426,7 +433,7 @@ public class MainApplication extends Main {
     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();
+        GuiHelper.runInEDTAndWait(() -> toolbar.refreshToolbarControl());
     }
 
     private static void processOffline(ProgramArguments args) {
diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
index 6c697ea..7d861b5 100644
--- a/src/org/openstreetmap/josm/gui/MainFrame.java
+++ b/src/org/openstreetmap/josm/gui/MainFrame.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -48,25 +47,26 @@ public class MainFrame extends JFrame {
 
     protected transient WindowGeometry geometry;
     protected int windowState = JFrame.NORMAL;
+    private final MainPanel panel;
     private MainMenu menu;
 
     /**
      * Create a new main window.
      */
     public MainFrame() {
-        this(new JPanel(), new WindowGeometry(new Rectangle(10, 10, 500, 500)));
+        this(new WindowGeometry(new Rectangle(10, 10, 500, 500)));
     }
 
     /**
-     * Create a new main window. The parameters will be removed in the future.
-     * @param contentPanePrivate The content
+     * Create a new main window. The parameter will be removed in the future.
      * @param geometry The inital geometry to use.
-     * @since 11713
+     * @since 12127
      */
-    public MainFrame(Container contentPanePrivate, WindowGeometry geometry) {
+    public MainFrame(WindowGeometry geometry) {
         super();
         this.geometry = geometry;
-        setContentPane(contentPanePrivate);
+        this.panel = new MainPanel(Main.getLayerManager());
+        setContentPane(new JPanel(new BorderLayout()));
     }
 
     /**
@@ -97,7 +97,7 @@ public class MainFrame extends JFrame {
 
         refreshTitle();
 
-        getContentPane().add(Main.panel, BorderLayout.CENTER);
+        getContentPane().add(panel, BorderLayout.CENTER);
         menu.initialize();
     }
 
@@ -114,6 +114,8 @@ public class MainFrame extends JFrame {
     /**
      * Gets the main menu used for this window.
      * @return The main menu.
+     * @throws IllegalStateException if the main frame has not been initialized yet
+     * @see #initialize
      */
     public MainMenu getMenu() {
         if (menu == null) {
@@ -123,6 +125,15 @@ public class MainFrame extends JFrame {
     }
 
     /**
+     * Gets the main panel.
+     * @return The main panel.
+     * @since 12125
+     */
+    public MainPanel getPanel() {
+        return panel;
+    }
+
+    /**
      * Sets this frame to be maximized.
      * @param maximized <code>true</code> if the window should be maximized.
      */
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index e1ea1fd..7c90159 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -495,7 +495,6 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
          */
         if (Main.pref.getBoolean("sidetoolbar.scrollable", true)) {
             final ScrollViewport svp = new ScrollViewport(sideToolBar, ScrollViewport.VERTICAL_DIRECTION);
-            svp.addMouseWheelListener(e -> svp.scroll(0, e.getUnitsToScroll() * 5));
             sideToolBar = svp;
         }
         sideToolBar.setVisible(Main.pref.getBoolean("sidetoolbar.visible", true));
@@ -784,14 +783,10 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
             }
         }
         // if this is really a change (and not the first active layer)
-        if (e.getPreviousActiveLayer() != null) {
-            if (!modeChanged && mapMode != null) {
-                // Let mapmodes know about new active layer
-                mapMode.exitMode();
-                mapMode.enterMode();
-            }
-            // invalidate repaint cache
-            mapView.preferenceChanged(null);
+        if (e.getPreviousActiveLayer() != null && !modeChanged && mapMode != null) {
+            // Let mapmodes know about new active layer
+            mapMode.exitMode();
+            mapMode.enterMode();
         }
 
         // After all listeners notice new layer, some buttons will be disabled/enabled
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index 082915e..e754efd 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -292,20 +292,20 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
                 boolean mouseNotMoved = oldMousePos != null && oldMousePos.equals(ms.mousePos);
                 boolean isAtOldPosition = mouseNotMoved && popup != null;
                 boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
-                try {
-                    ds = mv.getLayerManager().getEditDataSet();
-                    if (ds != null) {
-                        // This is not perfect, if current dataset was changed during execution, the lock would be useless
-                        if (isAtOldPosition && middleMouseDown) {
-                            // Write lock is necessary when selecting in popupCycleSelection
-                            // locks can not be upgraded -> if do read lock here and write lock later
-                            // (in OsmPrimitive.updateFlags) then always occurs deadlock (#5814)
-                            ds.beginUpdate();
-                        } else {
-                            ds.getReadLock().lock();
-                        }
-                    }
 
+                ds = mv.getLayerManager().getEditDataSet();
+                if (ds != null) {
+                    // This is not perfect, if current dataset was changed during execution, the lock would be useless
+                    if (isAtOldPosition && middleMouseDown) {
+                        // Write lock is necessary when selecting in popupCycleSelection
+                        // locks can not be upgraded -> if do read lock here and write lock later
+                        // (in OsmPrimitive.updateFlags) then always occurs deadlock (#5814)
+                        ds.beginUpdate();
+                    } else {
+                        ds.getReadLock().lock();
+                    }
+                }
+                try {
                     // Set the text label in the bottom status bar
                     // "if mouse moved only" was added to stop heap growing
                     if (!mouseNotMoved) {
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 3477e1e..4a11936 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -35,22 +35,22 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 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.ProjectionBounds;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 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.MapViewState.MapViewRectangle;
 import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
-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;
@@ -122,9 +122,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
          * @param p The paintable.
          */
         public synchronized void addTo(MapViewPaintable p) {
-            if (p instanceof AbstractMapViewPaintable) {
-                ((AbstractMapViewPaintable) p).addInvalidationListener(this);
-            }
+            p.addInvalidationListener(this);
         }
 
         /**
@@ -132,9 +130,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
          * @param p The paintable.
          */
         public synchronized void removeFrom(MapViewPaintable p) {
-            if (p instanceof AbstractMapViewPaintable) {
-                ((AbstractMapViewPaintable) p).removeInvalidationListener(this);
-            }
+            p.removeInvalidationListener(this);
             invalidatedLayers.remove(p);
         }
 
@@ -188,6 +184,11 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         }
     }
 
+    /**
+     * Replaced by the {@link DrawAction#VIEWPORT_FOLLOWING} property
+     * @deprecated since 12180. Can be remove soon (does any plugin even use this?)
+     */
+    @Deprecated
     public boolean viewportFollowing;
 
     /**
@@ -268,7 +269,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         });
 
         // listens to selection changes to redraw the map
-        DataSet.addSelectionListener(repaintSelectionChangedListener);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(repaintSelectionChangedListener);
 
         //store the last mouse action
         this.addMouseMotionListener(new MouseMotionListener() {
@@ -491,10 +492,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         int nonChangedLayersCount = 0;
         Set<MapViewPaintable> invalidated = invalidatedListener.collectInvalidatedLayers();
         for (Layer l: visibleLayers) {
-            // `isChanged` for backward compatibility, see https://josm.openstreetmap.de/ticket/13175#comment:7
-            // Layers that still implement it (plugins) will use it to tell the MapView that they have been changed.
-            // This is why the MapView still uses it in addition to the invalidation events.
-            if (l.isChanged() || invalidated.contains(l)) {
+            if (invalidated.contains(l)) {
                 break;
             } else {
                 nonChangedLayersCount++;
@@ -676,8 +674,9 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
                 b.setEnabled(activeLayerSupported);
             }
         }
+        // invalidate repaint cache. The layer order may have changed by this, so we invalidate every layer
+        getLayerManager().getLayers().forEach(invalidatedListener::invalidate);
         AudioPlayer.reset();
-        repaint();
     }
 
     /**
@@ -694,6 +693,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
             if (added) {
                 invalidatedListener.addTo(mvp);
             }
+            repaint();
             return added;
         }
     }
@@ -709,6 +709,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
             if (removed) {
                 invalidatedListener.removeFrom(mvp);
             }
+            repaint();
             return removed;
         }
     }
@@ -741,7 +742,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         paintPreferencesChanged.set(true);
     }
 
-    private final transient SelectionChangedListener repaintSelectionChangedListener = newSelection -> repaint();
+    private final transient DataSelectionListener repaintSelectionChangedListener = event -> repaint();
 
     /**
      * Destroy this map view panel. Should be called once when it is not needed any more.
@@ -750,7 +751,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
         layerManager.removeAndFireLayerChangeListener(this);
         layerManager.removeActiveLayerChangeListener(this);
         Main.pref.removePreferenceChangeListener(this);
-        DataSet.removeSelectionListener(repaintSelectionChangedListener);
+        SelectionEventManager.getInstance().removeSelectionListener(repaintSelectionChangedListener);
         MultipolygonCache.getInstance().clear();
         if (mapMover != null) {
             mapMover.destroy();
diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
index d70eb39..7e772ff 100644
--- a/src/org/openstreetmap/josm/gui/MapViewState.java
+++ b/src/org/openstreetmap/josm/gui/MapViewState.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.projection.Projecting;
@@ -179,12 +180,29 @@ public final class MapViewState implements Serializable {
 
     /**
      * Gets the {@link MapViewPoint} for the given {@link LatLon} coordinate.
+     * <p>
+     * This method exists to not break binary compatibility with old plugins
      * @param latlon the position
      * @return The point for that position.
      * @since 10651
      */
     public MapViewPoint getPointFor(LatLon latlon) {
-        return getPointFor(getProjection().latlon2eastNorth(latlon));
+        return getPointFor((ILatLon) latlon);
+    }
+
+    /**
+     * Gets the {@link MapViewPoint} for the given {@link LatLon} coordinate.
+     * @param latlon the position
+     * @return The point for that position.
+     * @since 12161
+     */
+    public MapViewPoint getPointFor(ILatLon latlon) {
+        try {
+            return getPointFor(Optional.ofNullable(latlon.getEastNorth(getProjection()))
+                    .orElseThrow(IllegalArgumentException::new));
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+            throw BugReport.intercept(e).put("latlon", latlon);
+        }
     }
 
     /**
@@ -195,12 +213,7 @@ public final class MapViewState implements Serializable {
      * @since 10827
      */
     public MapViewPoint getPointFor(Node node) {
-        try {
-            return getPointFor(Optional.ofNullable(node.getEastNorth(getProjection()))
-                    .orElseThrow(IllegalArgumentException::new));
-        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-            throw BugReport.intercept(e).put("node", node);
-        }
+        return getPointFor((ILatLon) node);
     }
 
     /**
@@ -230,15 +243,6 @@ public final class MapViewState implements Serializable {
     }
 
     /**
-     * Gets the center of the view, rounded to a pixel coordinate
-     * @return The center position.
-     * @since 10856
-     */
-    public MapViewPoint getCenterAtPixel() {
-        return getForView(viewWidth / 2, viewHeight / 2);
-    }
-
-    /**
      * Gets the width of the view on the Screen;
      * @return The width of the view component in screen pixel.
      */
@@ -257,12 +261,22 @@ public final class MapViewState implements Serializable {
     /**
      * Gets the current projection used for the MapView.
      * @return The projection.
+     * @see #getProjecting()
      */
     public Projection getProjection() {
         return projecting.getBaseProjection();
     }
 
     /**
+     * Gets the current projecting instance that is used to convert between east/north and lat/lon space.
+     * @return The projection.
+     * @since 12161
+     */
+    public Projecting getProjecting() {
+        return projecting;
+    }
+
+    /**
      * Creates an affine transform that is used to convert the east/north coordinates to view coordinates.
      * @return The affine transform. It should not be changed.
      * @since 10375
@@ -380,7 +394,7 @@ public final class MapViewState implements Serializable {
     private static EastNorth calculateDefaultCenter() {
         Bounds b = Optional.ofNullable(DownloadDialog.getSavedDownloadBounds()).orElseGet(
                 () -> Main.getProjection().getWorldBoundsLatLon());
-        return Main.getProjection().latlon2eastNorth(b.getCenter());
+        return b.getCenter().getEastNorth();
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/MenuScroller.java b/src/org/openstreetmap/josm/gui/MenuScroller.java
index 2029fd5..0efb185 100644
--- a/src/org/openstreetmap/josm/gui/MenuScroller.java
+++ b/src/org/openstreetmap/josm/gui/MenuScroller.java
@@ -303,19 +303,6 @@ public class MenuScroller {
         }
     }
 
-    /**
-     * Ensures that the <code>dispose</code> method of this MenuScroller is
-     * called when there are no more refrences to it.
-     *
-     * @throws Throwable if an error occurs.
-     * @see MenuScroller#dispose()
-     */
-    @Override
-    protected void finalize() throws Throwable {
-        dispose();
-        super.finalize();
-    }
-
     private void refreshMenu() {
         if (menuItems != null && menuItems.length > 0) {
 
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index 895902a..14f45a5 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -36,8 +36,8 @@ import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.ViewportData;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -51,6 +51,7 @@ import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
@@ -103,11 +104,6 @@ public class NavigatableComponent extends JComponent implements Helpful {
     /** Divide intervals between native resolution levels to smaller steps if they are much larger than zoom ratio */
     public static final BooleanProperty PROP_ZOOM_INTERMEDIATE_STEPS = new BooleanProperty("zoom.intermediate-steps", true);
 
-    /** Property name for center change events */
-    public static final String PROPNAME_CENTER = "center";
-    /** Property name for scale change events */
-    public static final String PROPNAME_SCALE = "scale";
-
     /**
      * The layer which scale is set to.
      */
@@ -175,13 +171,17 @@ public class NavigatableComponent extends JComponent implements Helpful {
     private transient MapViewState state;
 
     /**
+     * Main uses weak link to store this, so we need to keep a reference.
+     */
+    private final ProjectionChangeListener projectionChangeListener = (oldValue, newValue) -> fixProjection();
+
+    /**
      * Constructs a new {@code NavigatableComponent}.
      */
     public NavigatableComponent() {
         setLayout(null);
         state = MapViewState.createDefaultState(getWidth(), getHeight());
-        // uses weak link.
-        Main.addProjectionChangeListener((oldValue, newValue) -> fixProjection());
+        Main.addProjectionChangeListener(projectionChangeListener);
     }
 
     @Override
@@ -301,14 +301,14 @@ public class NavigatableComponent extends JComponent implements Helpful {
      * Zoom in current view. Use configured zoom step and scaling settings.
      */
     public void zoomIn() {
-        zoomTo(state.getCenterAtPixel().getEastNorth(), scaleZoomIn());
+        zoomTo(state.getCenter().getEastNorth(), scaleZoomIn());
     }
 
     /**
      * Zoom out current view. Use configured zoom step and scaling settings.
      */
     public void zoomOut() {
-        zoomTo(state.getCenterAtPixel().getEastNorth(), scaleZoomOut());
+        zoomTo(state.getCenter().getEastNorth(), scaleZoomOut());
     }
 
     protected void updateLocationState() {
@@ -405,7 +405,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
      * @return the current center of the viewport
      */
     public EastNorth getCenter() {
-        return state.getCenterAtPixel().getEastNorth();
+        return state.getCenter().getEastNorth();
     }
 
     /**
@@ -509,20 +509,23 @@ public class NavigatableComponent extends JComponent implements Helpful {
 
     /**
      * Return the point on the screen where this Coordinate would be.
+     *
+     * Alternative: {@link #getState()}, then {@link MapViewState#getPointFor(ILatLon)}
      * @param latlon The point, where this geopoint would be drawn.
      * @return The point on screen where "point" would be drawn, relative to the own top/left.
      */
     public Point2D getPoint2D(LatLon latlon) {
-        if (latlon == null)
+        if (latlon == null) {
             return new Point();
-        else if (latlon instanceof CachedLatLon)
-            return getPoint2D(((CachedLatLon) latlon).getEastNorth());
-        else
-            return getPoint2D(getProjection().latlon2eastNorth(latlon));
+        } else {
+            return getPoint2D(latlon.getEastNorth());
+        }
     }
 
     /**
      * Return the point on the screen where this Node would be.
+     *
+     * Alternative: {@link #getState()}, then {@link MapViewState#getPointFor(ILatLon)}
      * @param n The node, where this geopoint would be drawn.
      * @return The point on screen where "node" would be drawn, relative to the own top/left.
      */
@@ -663,20 +666,11 @@ public class NavigatableComponent extends JComponent implements Helpful {
      */
     private void zoomNoUndoTo(EastNorth newCenter, double newScale, boolean initial) {
         if (!Utils.equalsEpsilon(getScale(), newScale)) {
-            double oldScale = getScale();
             state = state.usingScale(newScale);
-            if (!initial) {
-                firePropertyChange(PROPNAME_SCALE, oldScale, newScale);
-            }
         }
         if (!newCenter.equals(getCenter())) {
-            EastNorth oldCenter = getCenter();
             state = state.movedTo(state.getCenter(), newCenter);
-            if (!initial) {
-                firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
-            }
         }
-
         if (!initial) {
             repaint();
             fireZoomChanged();
diff --git a/src/org/openstreetmap/josm/gui/ScrollViewport.java b/src/org/openstreetmap/josm/gui/ScrollViewport.java
index 0291021..ecc2deb 100644
--- a/src/org/openstreetmap/josm/gui/ScrollViewport.java
+++ b/src/org/openstreetmap/josm/gui/ScrollViewport.java
@@ -20,8 +20,11 @@ import javax.swing.Timer;
 
 import org.openstreetmap.josm.tools.ImageProvider;
 
-/** A viewport with UP and DOWN arrow buttons, so that the user can make the
+/**
+ * A viewport with UP and DOWN arrow buttons, so that the user can make the
  * content scroll.
+ *
+ * This should be used for long, vertical toolbars.
  */
 public class ScrollViewport extends JPanel {
 
@@ -31,8 +34,19 @@ public class ScrollViewport extends JPanel {
     public static final int DOWN_DIRECTION = 2;
     public static final int LEFT_DIRECTION = 4;
     public static final int RIGHT_DIRECTION = 8;
+    /**
+     * Allow vertical scrolling
+     */
     public static final int VERTICAL_DIRECTION = UP_DIRECTION | DOWN_DIRECTION;
+
+    /**
+     * Allow horizontal scrolling
+     */
     public static final int HORIZONTAL_DIRECTION = LEFT_DIRECTION | RIGHT_DIRECTION;
+
+    /**
+     * Allow scrolling in both directions
+     */
     public static final int ALL_DIRECTION = HORIZONTAL_DIRECTION | VERTICAL_DIRECTION;
 
     private class ScrollViewPortMouseListener extends MouseAdapter {
@@ -71,70 +85,83 @@ public class ScrollViewport extends JPanel {
 
     private int scrollDirection = NO_SCROLL;
 
+    private final int allowedScrollDirections;
+
+    private final ComponentAdapter refreshButtonsOnResize = new ComponentAdapter() {
+        @Override
+        public void componentResized(ComponentEvent e) {
+            showOrHideButtons();
+        }
+    };
+
+    /**
+     * Create a new scroll viewport
+     * @param c The component to display as content.
+     * @param direction The direction to scroll.
+     *        Should be one of {@link #VERTICAL_DIRECTION}, {@link #HORIZONTAL_DIRECTION}, {@link #ALL_DIRECTION}
+     */
     public ScrollViewport(JComponent c, int direction) {
         this(direction);
         add(c);
     }
 
+    /**
+     * Create a new scroll viewport
+     * @param direction The direction to scroll.
+     *        Should be one of {@link #VERTICAL_DIRECTION}, {@link #HORIZONTAL_DIRECTION}, {@link #ALL_DIRECTION}
+     */
     public ScrollViewport(int direction) {
-        setLayout(new BorderLayout());
-
-        JButton button;
+        super(new BorderLayout());
+        this.allowedScrollDirections = direction;
 
         // UP
         if ((direction & UP_DIRECTION) != 0) {
-            button = new JButton();
-            button.addMouseListener(new ScrollViewPortMouseListener(UP_DIRECTION));
-            button.setPreferredSize(new Dimension(10, 10));
-            button.setIcon(ImageProvider.get("svpUp"));
-            add(button, BorderLayout.NORTH);
-            buttons.add(button);
+            addScrollButton(UP_DIRECTION, "svpUp", BorderLayout.NORTH);
         }
 
         // DOWN
         if ((direction & DOWN_DIRECTION) != 0) {
-            button = new JButton();
-            button.addMouseListener(new ScrollViewPortMouseListener(DOWN_DIRECTION));
-            button.setPreferredSize(new Dimension(10, 10));
-            button.setIcon(ImageProvider.get("svpDown"));
-            add(button, BorderLayout.SOUTH);
-            buttons.add(button);
+            addScrollButton(DOWN_DIRECTION, "svpDown", BorderLayout.SOUTH);
         }
 
         // LEFT
         if ((direction & LEFT_DIRECTION) != 0) {
-            button = new JButton();
-            button.addMouseListener(new ScrollViewPortMouseListener(LEFT_DIRECTION));
-            button.setPreferredSize(new Dimension(10, 10));
-            button.setIcon(ImageProvider.get("svpLeft"));
-            add(button, BorderLayout.WEST);
-            buttons.add(button);
+            addScrollButton(LEFT_DIRECTION, "svpLeft", BorderLayout.WEST);
         }
 
         // RIGHT
         if ((direction & RIGHT_DIRECTION) != 0) {
-            button = new JButton();
-            button.addMouseListener(new ScrollViewPortMouseListener(RIGHT_DIRECTION));
-            button.setPreferredSize(new Dimension(10, 10));
-            button.setIcon(ImageProvider.get("svpRight"));
-            add(button, BorderLayout.EAST);
-            buttons.add(button);
+            addScrollButton(RIGHT_DIRECTION, "svpRight", BorderLayout.EAST);
         }
 
         add(vp, BorderLayout.CENTER);
 
-        this.addComponentListener(new ComponentAdapter() {
-            @Override public void componentResized(ComponentEvent e) {
-                showOrHideButtons();
-            }
-        });
+        this.addComponentListener(refreshButtonsOnResize);
 
         showOrHideButtons();
 
+        if ((direction & VERTICAL_DIRECTION) != 0) {
+            addMouseWheelListener(e -> scroll(0, e.getUnitsToScroll() * 5));
+        } else if ((direction & HORIZONTAL_DIRECTION) != 0) {
+            addMouseWheelListener(e -> scroll(e.getUnitsToScroll() * 5, 0));
+        }
+
         timer.setRepeats(true);
         timer.setInitialDelay(400);
     }
 
+    private void addScrollButton(int direction, String icon, String borderLayoutPosition) {
+        JButton button = new JButton();
+        button.addMouseListener(new ScrollViewPortMouseListener(direction));
+        button.setPreferredSize(new Dimension(10, 10));
+        button.setIcon(ImageProvider.get(icon));
+        add(button, borderLayoutPosition);
+        buttons.add(button);
+    }
+
+    /**
+     * Scrolls in the currently selected scroll direction.
+     */
     public synchronized void scroll() {
         int direction = scrollDirection;
 
@@ -165,6 +192,11 @@ public class ScrollViewport extends JPanel {
         scroll(deltaX, deltaY);
     }
 
+    /**
+     * Scrolls by the given offset
+     * @param deltaX offset x
+     * @param deltaY offset y
+     */
     public synchronized void scroll(int deltaX, int deltaY) {
         if (component == null)
             return;
@@ -195,8 +227,13 @@ public class ScrollViewport extends JPanel {
      * Only show them if the Viewport is too small for the content.
      */
     public void showOrHideButtons() {
-        boolean needButtons = vp.getViewSize().height > vp.getViewRect().height ||
-        vp.getViewSize().width > vp.getViewRect().width;
+        boolean needButtons = false;
+        if ((allowedScrollDirections & VERTICAL_DIRECTION) != 0) {
+            needButtons |= getViewSize().height > getViewRect().height;
+        }
+        if ((allowedScrollDirections & HORIZONTAL_DIRECTION) != 0) {
+            needButtons |= getViewSize().width > getViewRect().width;
+        }
         for (JButton b : buttons) {
             b.setVisible(needButtons);
         }
@@ -214,9 +251,42 @@ public class ScrollViewport extends JPanel {
         return vp.getViewPosition();
     }
 
+    @Override
+    public Dimension getPreferredSize() {
+        if (component == null) {
+            return vp.getPreferredSize();
+        } else {
+            return component.getPreferredSize();
+        }
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        if (component == null) {
+            return vp.getMinimumSize();
+        } else {
+            Dimension minSize = component.getMinimumSize();
+            if ((allowedScrollDirections & HORIZONTAL_DIRECTION) != 0) {
+                minSize = new Dimension(20, minSize.height);
+            }
+            if ((allowedScrollDirections & VERTICAL_DIRECTION) != 0) {
+                minSize = new Dimension(minSize.width, 20);
+            }
+            return minSize;
+        }
+    }
+
+    /**
+     * Sets the component to be used as content.
+     * @param c The component
+     */
     public void add(JComponent c) {
         vp.removeAll();
+        if (this.component != null) {
+            this.component.removeComponentListener(refreshButtonsOnResize);
+        }
         this.component = c;
+        c.addComponentListener(refreshButtonsOnResize);
         vp.add(c);
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 1632c92..7fbf414 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -58,7 +58,6 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
         static {
             // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list
             existingSlippyMapUrls.add("https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png");      // Mapnik
-            existingSlippyMapUrls.add("http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png"); // Cyclemap
         }
 
         @Override
@@ -97,9 +96,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
 
     private static CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<>();
     static {
-        addTileSourceProvider(() -> Arrays.<TileSource>asList(
-                new OsmTileSource.Mapnik(),
-                new OsmTileSource.CycleMap()));
+        addTileSourceProvider(() -> Arrays.<TileSource>asList(new OsmTileSource.Mapnik()));
         addTileSourceProvider(new TMSTileSourceProvider());
     }
 
diff --git a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
index 1f61392..dd3cecd 100644
--- a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
@@ -52,6 +52,7 @@ import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * TileSelectionBBoxChooser allows to select a bounding box (i.e. for downloading) based
@@ -183,7 +184,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
      */
     protected LatLon getNorthWestLatLonOfTile(Point tile, int zoom) {
         double lon = tile.x / Math.pow(2.0, zoom) * 360.0 - 180;
-        double lat = Math.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom))));
+        double lat = Utils.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom))));
         return new LatLon(lat, lon);
     }
 
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
index 5438289..cce51d4 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
@@ -75,6 +75,11 @@ import org.openstreetmap.josm.tools.Utils;
  * @see AbstractListMerger
  */
 public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends ConflictResolveCommand> extends ChangeNotifier {
+    /**
+     * The property name to listen for frozen changes.
+     * @see #setFrozen(boolean)
+     * @see #isFrozen()
+     */
     public static final String FROZEN_PROP = AbstractListMergeModel.class.getName() + ".frozen";
 
     private static final int MAX_DELETED_PRIMITIVE_IN_DIALOG = 5;
@@ -229,15 +234,23 @@ public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends Co
         synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
             listeners.forEach(listener -> listener.propertyChange(evt));
-            }
         }
+    }
 
+    /**
+     * Sets the frozen status for this model.
+     * @param isFrozen <code>true</code> if it should be frozen.
+     */
     public final void setFrozen(boolean isFrozen) {
         boolean oldValue = this.isFrozen;
         this.isFrozen = isFrozen;
         fireFrozenChanged(oldValue, this.isFrozen);
     }
 
+    /**
+     * Check if the model is frozen.
+     * @return The current frozen state.
+     */
     public final boolean isFrozen() {
         return isFrozen;
     }
@@ -397,6 +410,10 @@ public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends Co
         }
     }
 
+    /**
+     * Copies over all values from the given side to the merged table..
+     * @param source The source side to copy from.
+     */
     public void copyAll(ListRole source) {
         getMergedEntries().clear();
 
@@ -566,7 +583,6 @@ public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends Co
      * @return true, if the lists are equal; false otherwise
      */
     protected boolean myAndTheirEntriesEqual() {
-
         if (getMyEntriesSize() != getTheirEntriesSize())
             return false;
         for (int i = 0; i < getMyEntriesSize(); i++) {
@@ -703,6 +719,10 @@ public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends Co
             return entries.get(opposite);
         }
 
+        /**
+         * Get the role of the table.
+         * @return The role.
+         */
         public ListRole getRole() {
             return role;
         }
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java
new file mode 100644
index 0000000..44ded39
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java
@@ -0,0 +1,205 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.pair;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * A panel used as tab in the merge dialog.
+ * Contains helper methods for creating merge dialog columns.
+ *
+ * @author Michael Zangl
+ * @since 12044
+ */
+public abstract class AbstractMergePanel extends JPanel {
+
+    /**
+     * A helper class to add a row to the layout. Each row has 6 columns.
+     * @author Michael Zangl
+     */
+    protected static class MergeRow {
+        protected int marginTop = 5;
+
+        public MergeRow() {
+            // allow access from subclasses
+        }
+
+        protected JComponent rowTitle() {
+            return null;
+        }
+
+        protected JComponent mineField() {
+            return null;
+        }
+
+        protected JComponent mineButton() {
+            return null;
+        }
+
+        protected JComponent merged() {
+            return null;
+        }
+
+        protected JComponent theirsButton() {
+            return null;
+        }
+
+        protected JComponent theirsField() {
+            return null;
+        }
+
+        void addTo(AbstractMergePanel panel) {
+            JComponent[] buttons = getColumns();
+            for (int columnIndex = 0; columnIndex < buttons.length; columnIndex++) {
+                if (buttons[columnIndex] != null) {
+                    GBC constraints = GBC.std(columnIndex, panel.currentRow);
+                    addConstraints(constraints, columnIndex);
+                    panel.add(buttons[columnIndex], constraints);
+                }
+            }
+            panel.currentRow++;
+        }
+
+        protected JComponent[] getColumns() {
+            return new JComponent[] {
+                    rowTitle(),
+                    mineField(),
+                    mineButton(),
+                    merged(),
+                    theirsButton(),
+                    theirsField()
+            };
+        }
+
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            constraints.anchor(GBC.CENTER);
+            constraints.fill = GBC.BOTH;
+            constraints.weight(0, 0);
+            constraints.insets(3, marginTop, 3, 0);
+            if (columnIndex == 1 || columnIndex == 3 || columnIndex == 5) {
+                // resize those rows
+                constraints.weightx = 1;
+            }
+        }
+    }
+
+    /**
+     * A row that does not contain the merge buttons. Fields in this row fill both the button and filed area.
+     */
+    protected static class MergeRowWithoutButton extends MergeRow {
+        @Override
+        protected JComponent[] getColumns() {
+            return new JComponent[] {
+                    rowTitle(),
+                    mineField(), // width: 2
+                    null,
+                    merged(),
+                    theirsField(), // width: 2
+                    null,
+            };
+        }
+
+        @Override
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            super.addConstraints(constraints, columnIndex);
+
+            if (columnIndex == 1 || columnIndex == 4) {
+                constraints.gridwidth = 2;
+            }
+        }
+    }
+
+    /**
+     * The title for the rows (mine, merged, theirs)
+     */
+    protected static class TitleRow extends MergeRow {
+        public TitleRow() {
+            // allow access from subclasses
+        }
+
+        @Override
+        protected JComponent mineField() {
+            JLabel label = new JLabel(tr("My version (local dataset)"));
+            label.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
+            label.setHorizontalAlignment(JLabel.CENTER);
+            return label;
+        }
+
+        @Override
+        protected JComponent merged() {
+            JLabel label = new JLabel(tr("Merged version"));
+            label.setToolTipText(
+                    tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
+            label.setHorizontalAlignment(JLabel.CENTER);
+            return label;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            JLabel label = new JLabel(tr("Their version (server dataset)"));
+            label.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
+            label.setHorizontalAlignment(JLabel.CENTER);
+            return label;
+        }
+    }
+
+    /**
+     * Add the undecide button to the middle of the merged row.
+     */
+    protected abstract static class AbstractUndecideRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent merged() {
+            AbstractAction actUndecide = createAction();
+            JButton button = new JButton(actUndecide);
+            button.setName(getButtonName());
+            return button;
+        }
+
+        protected abstract AbstractAction createAction();
+
+        protected abstract String getButtonName();
+
+        @Override
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            super.addConstraints(constraints, columnIndex);
+            constraints.fill(GBC.NONE);
+        }
+    }
+
+    /**
+     * The current row counter. Used when adding new rows.
+     */
+    protected int currentRow;
+
+    /**
+     * Create a new merge panel.
+     */
+    public AbstractMergePanel() {
+        super(new GridBagLayout());
+    }
+
+    /**
+     * Add the rows to this component.
+     * This needs to be called in the constructor of the child class. That way, all it's fields are initialized.
+     */
+    protected void buildRows() {
+        getRows().forEach(row -> row.addTo(this));
+    }
+
+    /**
+     * Gets the rows.
+     * @return A list of rows that should be displayed in this dialog.
+     */
+    protected abstract List<? extends MergeRow> getRows();
+
+}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
index cb77c62..08bc7cd 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
@@ -11,7 +11,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.ImageIcon;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 
 import org.openstreetmap.josm.command.Command;
@@ -97,22 +99,22 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
         propertiesMerger = new PropertiesMerger();
         propertiesMerger.setName("panel.propertiesmerger");
         propertiesMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Properties"), propertiesMerger);
+        addTab(tr("Properties"), propertiesMerger);
 
         tagMerger = new TagMerger();
         tagMerger.setName("panel.tagmerger");
         tagMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Tags"), tagMerger);
+        addTab(tr("Tags"), tagMerger);
 
         nodeListMerger = new NodeListMerger();
         nodeListMerger.setName("panel.nodelistmerger");
         nodeListMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Nodes"), nodeListMerger);
+        addTab(tr("Nodes"), nodeListMerger);
 
         relationMemberMerger = new RelationMemberMerger();
         relationMemberMerger.setName("panel.relationmembermerger");
         relationMemberMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Members"), relationMemberMerger);
+        addTab(tr("Members"), relationMemberMerger);
 
         setLayout(new BorderLayout());
         add(tabbedPane, BorderLayout.CENTER);
@@ -123,6 +125,11 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
         conflictResolvers.add(relationMemberMerger);
     }
 
+    private void addTab(String title, JComponent tabContent) {
+        JScrollPane scrollPanel = new JScrollPane(tabContent);
+        tabbedPane.add(title, scrollPanel);
+    }
+
     /**
      * constructor
      */
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 a64ccf2..01e3af8 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
@@ -3,17 +3,16 @@ package org.openstreetmap.josm.gui.conflict.pair.properties;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.text.DecimalFormat;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
@@ -24,9 +23,11 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.gui.history.VersionInfoPanel;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -34,7 +35,7 @@ import org.openstreetmap.josm.tools.Utils;
  * This class represents a UI component for resolving conflicts in some properties of {@link OsmPrimitive}.
  * @since 1654
  */
-public class PropertiesMerger extends JPanel implements ChangeListener, IConflictResolver {
+public class PropertiesMerger extends AbstractMergePanel implements ChangeListener, IConflictResolver {
     private static final DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
     private final JLabel lblMyCoordinates = buildValueLabel("label.mycoordinates");
@@ -48,7 +49,7 @@ public class PropertiesMerger extends JPanel implements ChangeListener, IConflic
     private final JLabel lblMyReferrers = buildValueLabel("label.myreferrers");
     private final JLabel lblTheirReferrers = buildValueLabel("label.theirreferrers");
 
-    private final transient PropertiesMergeModel model;
+    private final transient PropertiesMergeModel model = new PropertiesMergeModel();
     private final VersionInfoPanel mineVersionInfo = new VersionInfoPanel();
     private final VersionInfoPanel theirVersionInfo = new VersionInfoPanel();
 
@@ -56,9 +57,21 @@ public class PropertiesMerger extends JPanel implements ChangeListener, IConflic
      * Constructs a new {@code PropertiesMerger}.
      */
     public PropertiesMerger() {
-        model = new PropertiesMergeModel();
         model.addChangeListener(this);
-        build();
+        buildRows();
+    }
+
+    @Override
+    protected List<? extends MergeRow> getRows() {
+        return Arrays.asList(
+                new AbstractMergePanel.TitleRow(),
+                new VersionInfoRow(),
+                new MergeCoordinatesRow(),
+                new UndecideCoordinatesRow(),
+                new MergeDeletedStateRow(),
+                new UndecideDeletedStateRow(),
+                new ReferrersRow(),
+                new EmptyFillRow());
     }
 
     protected static JLabel buildValueLabel(String name) {
@@ -70,225 +83,6 @@ public class PropertiesMerger extends JPanel implements ChangeListener, IConflic
         return lbl;
     }
 
-    protected void buildHeaderRow() {
-        GridBagConstraints gc = new GridBagConstraints();
-
-        gc.gridx = 1;
-        gc.gridy = 0;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        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;
-        JLabel lblMergedVersion = new JLabel(tr("Merged version"));
-        lblMergedVersion.setToolTipText(
-                tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
-        add(lblMergedVersion, gc);
-
-        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;
-        gc.gridy = 1;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.LINE_START;
-        gc.insets = new Insets(0, 0, 20, 0);
-        add(mineVersionInfo, gc);
-
-        gc.gridx = 5;
-        add(theirVersionInfo, gc);
-    }
-
-    protected void buildCoordinateConflictRows() {
-        GridBagConstraints gc = new GridBagConstraints();
-
-        gc.gridx = 0;
-        gc.gridy = 2;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.anchor = GridBagConstraints.LINE_START;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(0, 5, 0, 5);
-        add(new JLabel(tr("Coordinates:")), gc);
-
-        gc.gridx = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblMyCoordinates, gc);
-
-        gc.gridx = 2;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepMyCoordinatesAction actKeepMyCoordinates = new KeepMyCoordinatesAction();
-        model.addChangeListener(actKeepMyCoordinates);
-        JButton btnKeepMyCoordinates = new JButton(actKeepMyCoordinates);
-        btnKeepMyCoordinates.setName("button.keepmycoordinates");
-        add(btnKeepMyCoordinates, gc);
-
-        gc.gridx = 3;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblMergedCoordinates, gc);
-
-        gc.gridx = 4;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepTheirCoordinatesAction actKeepTheirCoordinates = new KeepTheirCoordinatesAction();
-        model.addChangeListener(actKeepTheirCoordinates);
-        JButton btnKeepTheirCoordinates = new JButton(actKeepTheirCoordinates);
-        add(btnKeepTheirCoordinates, gc);
-
-        gc.gridx = 5;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblTheirCoordinates, gc);
-
-        // ---------------------------------------------------
-        gc.gridx = 3;
-        gc.gridy = 3;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        UndecideCoordinateConflictAction actUndecideCoordinates = new UndecideCoordinateConflictAction();
-        model.addChangeListener(actUndecideCoordinates);
-        JButton btnUndecideCoordinates = new JButton(actUndecideCoordinates);
-        add(btnUndecideCoordinates, gc);
-    }
-
-    protected void buildDeletedStateConflictRows() {
-        GridBagConstraints gc = new GridBagConstraints();
-
-        gc.gridx = 0;
-        gc.gridy = 4;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.LINE_START;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(0, 5, 0, 5);
-        add(new JLabel(tr("Deleted State:")), gc);
-
-        gc.gridx = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblMyDeletedState, gc);
-
-        gc.gridx = 2;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepMyDeletedStateAction actKeepMyDeletedState = new KeepMyDeletedStateAction();
-        model.addChangeListener(actKeepMyDeletedState);
-        JButton btnKeepMyDeletedState = new JButton(actKeepMyDeletedState);
-        btnKeepMyDeletedState.setName("button.keepmydeletedstate");
-        add(btnKeepMyDeletedState, gc);
-
-        gc.gridx = 3;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblMergedDeletedState, gc);
-
-        gc.gridx = 4;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepTheirDeletedStateAction actKeepTheirDeletedState = new KeepTheirDeletedStateAction();
-        model.addChangeListener(actKeepTheirDeletedState);
-        JButton btnKeepTheirDeletedState = new JButton(actKeepTheirDeletedState);
-        btnKeepTheirDeletedState.setName("button.keeptheirdeletedstate");
-        add(btnKeepTheirDeletedState, gc);
-
-        gc.gridx = 5;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblTheirDeletedState, gc);
-
-        // ---------------------------------------------------
-        gc.gridx = 3;
-        gc.gridy = 5;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        UndecideDeletedStateConflictAction actUndecideDeletedState = new UndecideDeletedStateConflictAction();
-        model.addChangeListener(actUndecideDeletedState);
-        JButton btnUndecideDeletedState = new JButton(actUndecideDeletedState);
-        btnUndecideDeletedState.setName("button.undecidedeletedstate");
-        add(btnUndecideDeletedState, gc);
-    }
-
-    protected void buildReferrersRow() {
-        GridBagConstraints gc = new GridBagConstraints();
-
-        gc.gridx = 0;
-        gc.gridy = 7;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.LINE_START;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(0, 5, 0, 5);
-        add(new JLabel(tr("Referenced by:")), gc);
-
-        gc.gridx = 1;
-        gc.gridy = 7;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblMyReferrers, gc);
-
-        gc.gridx = 5;
-        gc.gridy = 7;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.33;
-        gc.weighty = 0.0;
-        add(lblTheirReferrers, gc);
-    }
-
-    protected final void build() {
-        setLayout(new GridBagLayout());
-        buildHeaderRow();
-        buildCoordinateConflictRows();
-        buildDeletedStateConflictRows();
-        buildReferrersRow();
-    }
-
     protected static String coordToString(LatLon coord) {
         if (coord == null)
             return tr("(none)");
@@ -398,6 +192,157 @@ public class PropertiesMerger extends JPanel implements ChangeListener, IConflic
         return model;
     }
 
+    private final class MergeDeletedStateRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent rowTitle() {
+            return new JLabel(tr("Deleted State:"));
+        }
+
+        @Override
+        protected JComponent mineField() {
+            return lblMyDeletedState;
+        }
+
+        @Override
+        protected JComponent mineButton() {
+            KeepMyDeletedStateAction actKeepMyDeletedState = new KeepMyDeletedStateAction();
+            model.addChangeListener(actKeepMyDeletedState);
+            JButton btnKeepMyDeletedState = new JButton(actKeepMyDeletedState);
+            btnKeepMyDeletedState.setName("button.keepmydeletedstate");
+            return btnKeepMyDeletedState;
+        }
+
+        @Override
+        protected JComponent merged() {
+            return lblMergedDeletedState;
+        }
+
+        @Override
+        protected JComponent theirsButton() {
+            KeepTheirDeletedStateAction actKeepTheirDeletedState = new KeepTheirDeletedStateAction();
+            model.addChangeListener(actKeepTheirDeletedState);
+            JButton btnKeepTheirDeletedState = new JButton(actKeepTheirDeletedState);
+            btnKeepTheirDeletedState.setName("button.keeptheirdeletedstate");
+            return btnKeepTheirDeletedState;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            return lblTheirDeletedState;
+        }
+    }
+
+    private final class MergeCoordinatesRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent rowTitle() {
+            return new JLabel(tr("Coordinates:"));
+        }
+
+        @Override
+        protected JComponent mineField() {
+            return lblMyCoordinates;
+        }
+
+        @Override
+        protected JComponent mineButton() {
+            KeepMyCoordinatesAction actKeepMyCoordinates = new KeepMyCoordinatesAction();
+            model.addChangeListener(actKeepMyCoordinates);
+            JButton btnKeepMyCoordinates = new JButton(actKeepMyCoordinates);
+            btnKeepMyCoordinates.setName("button.keepmycoordinates");
+            return btnKeepMyCoordinates;
+        }
+
+        @Override
+        protected JComponent merged() {
+            return lblMergedCoordinates;
+        }
+
+        @Override
+        protected JComponent theirsButton() {
+            KeepTheirCoordinatesAction actKeepTheirCoordinates = new KeepTheirCoordinatesAction();
+            model.addChangeListener(actKeepTheirCoordinates);
+            JButton btnKeepTheirCoordinates = new JButton(actKeepTheirCoordinates);
+            btnKeepTheirCoordinates.setName("button.keeptheircoordinates");
+            return btnKeepTheirCoordinates;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            return lblTheirCoordinates;
+        }
+    }
+
+    private final class UndecideCoordinatesRow extends AbstractUndecideRow {
+        @Override
+        protected UndecideCoordinateConflictAction createAction() {
+            UndecideCoordinateConflictAction action = new UndecideCoordinateConflictAction();
+            model.addChangeListener(action);
+            return action;
+        }
+
+        @Override
+        protected String getButtonName() {
+            return "button.undecidecoordinates";
+        }
+    }
+
+    private final class UndecideDeletedStateRow extends AbstractUndecideRow {
+        @Override
+        protected UndecideDeletedStateConflictAction createAction() {
+            UndecideDeletedStateConflictAction action = new UndecideDeletedStateConflictAction();
+            model.addChangeListener(action);
+            return action;
+        }
+
+        @Override
+        protected String getButtonName() {
+            return "button.undecidedeletedstate";
+        }
+    }
+
+    private final class VersionInfoRow extends AbstractMergePanel.MergeRowWithoutButton {
+        @Override
+        protected JComponent mineField() {
+            return mineVersionInfo;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            return theirVersionInfo;
+        }
+    }
+
+    private final class ReferrersRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent rowTitle() {
+            return new JLabel(tr("Referenced by:"));
+        }
+
+        @Override
+        protected JComponent mineField() {
+            return lblMyReferrers;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            return lblTheirReferrers;
+        }
+    }
+
+    private static final class EmptyFillRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent merged() {
+            return new JPanel();
+        }
+
+        @Override
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            super.addConstraints(constraints, columnIndex);
+            // fill to bottom
+            constraints.weighty = 1;
+        }
+    }
+
     class KeepMyCoordinatesAction extends AbstractAction implements ChangeListener {
         KeepMyCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
index 0b4d81d..e2d1721 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
@@ -4,23 +4,21 @@ package org.openstreetmap.josm.gui.conflict.pair.tags;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Adjustable;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
+import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.event.ListSelectionEvent;
@@ -28,204 +26,57 @@ import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
  * UI component for resolving conflicts in the tag sets of two {@link OsmPrimitive}s.
  * @since 1622
  */
-public class TagMerger extends JPanel implements IConflictResolver {
+public class TagMerger extends AbstractMergePanel implements IConflictResolver {
+    private static final String[] KEY_VALUE = new String[] {tr("Key"), tr("Value")};
 
-    private JTable mineTable;
-    private JTable mergedTable;
-    private JTable theirTable;
-    private final TagMergeModel model;
-    private final String[] keyvalue;
-    private transient AdjustmentSynchronizer adjustmentSynchronizer;
+    private final TagMergeModel model = new TagMergeModel();
 
     /**
-     * Constructs a new {@code TagMerger}.
+     * the table for my tag set
      */
-    public TagMerger() {
-        model = new TagMergeModel();
-        keyvalue = new String[]{tr("Key"), tr("Value")};
-        build();
-    }
-
+    private final JTable mineTable = generateTable(new MineTableCellRenderer());
     /**
-     * embeds table in a new {@link JScrollPane} and returns th scroll pane
-     *
-     * @param table the table
-     * @return the scroll pane embedding the table
+     * the table for the merged tag set
      */
-    protected JScrollPane embeddInScrollPane(JTable table) {
-        JScrollPane pane = new JScrollPane(table);
-        adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());
-        return pane;
-    }
-
+    private final JTable mergedTable = generateTable(new MergedTableCellRenderer());
     /**
-     * builds the table for my tag set (table already embedded in a scroll pane)
-     *
-     * @return the table (embedded in a scroll pane)
+     * the table for their tag set
      */
-    protected JScrollPane buildMineTagTable() {
-        mineTable = new JTable(model, new TagTableColumnModelBuilder(new MineTableCellRenderer(), keyvalue).build());
-        mineTable.setName("table.my");
-        return embeddInScrollPane(mineTable);
-    }
+    private final JTable theirTable = generateTable(new TheirTableCellRenderer());
 
     /**
-     * builds the table for their tag set (table already embedded in a scroll pane)
-     *
-     * @return the table (embedded in a scroll pane)
+     * Constructs a new {@code TagMerger}.
      */
-    protected JScrollPane buildTheirTable() {
-        theirTable = new JTable(model, new TagTableColumnModelBuilder(new TheirTableCellRenderer(), keyvalue).build());
+    public TagMerger() {
+        mineTable.setName("table.my");
         theirTable.setName("table.their");
-        return embeddInScrollPane(theirTable);
-    }
-
-    /**
-     * builds the table for the merged tag set (table already embedded in a scroll pane)
-     *
-     * @return the table (embedded in a scroll pane)
-     */
-
-    protected JScrollPane buildMergedTable() {
-        mergedTable = new JTable(model, new TagTableColumnModelBuilder(new MergedTableCellRenderer(), keyvalue).build());
         mergedTable.setName("table.merged");
-        return embeddInScrollPane(mergedTable);
-    }
-
-    /**
-     * build the user interface
-     */
-    protected final void build() {
-        GridBagConstraints gc = new GridBagConstraints();
-        setLayout(new GridBagLayout());
-
-        adjustmentSynchronizer = new AdjustmentSynchronizer();
-
-        gc.gridx = 0;
-        gc.gridy = 0;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(10, 0, 10, 0);
-        JLabel lblMy = new JLabel(tr("My version (local dataset)"));
-        add(lblMy, gc);
-
-        gc.gridx = 2;
-        gc.gridy = 0;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        JLabel lblMerge = new JLabel(tr("Merged version"));
-        add(lblMerge, gc);
-
-        gc.gridx = 4;
-        gc.gridy = 0;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(0, 0, 0, 0);
-        JLabel lblTheir = new JLabel(tr("Their version (server dataset)"));
-        add(lblTheir, gc);
-
-        gc.gridx = 0;
-        gc.gridy = 1;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        gc.weightx = 0.3;
-        gc.weighty = 1.0;
-        JScrollPane tabMy = buildMineTagTable();
-        lblMy.setLabelFor(tabMy);
-        add(tabMy, gc);
-
-        gc.gridx = 1;
-        gc.gridy = 1;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepMineAction keepMineAction = new KeepMineAction();
-        mineTable.getSelectionModel().addListSelectionListener(keepMineAction);
-        JButton btnKeepMine = new JButton(keepMineAction);
-        btnKeepMine.setName("button.keepmine");
-        add(btnKeepMine, gc);
-
-        gc.gridx = 2;
-        gc.gridy = 1;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        gc.weightx = 0.3;
-        gc.weighty = 1.0;
-        JScrollPane tabMerge = buildMergedTable();
-        lblMerge.setLabelFor(tabMerge);
-        add(tabMerge, gc);
-
-        gc.gridx = 3;
-        gc.gridy = 1;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        KeepTheirAction keepTheirAction = new KeepTheirAction();
-        JButton btnKeepTheir = new JButton(keepTheirAction);
-        btnKeepTheir.setName("button.keeptheir");
-        add(btnKeepTheir, gc);
-
-        gc.gridx = 4;
-        gc.gridy = 1;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.BOTH;
-        gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        gc.weightx = 0.3;
-        gc.weighty = 1.0;
-        JScrollPane tabTheir = buildTheirTable();
-        lblTheir.setLabelFor(tabTheir);
-        add(tabTheir, gc);
-        theirTable.getSelectionModel().addListSelectionListener(keepTheirAction);
 
         DoubleClickAdapter dblClickAdapter = new DoubleClickAdapter();
         mineTable.addMouseListener(dblClickAdapter);
         theirTable.addMouseListener(dblClickAdapter);
 
-        gc.gridx = 2;
-        gc.gridy = 2;
-        gc.gridwidth = 1;
-        gc.gridheight = 1;
-        gc.fill = GridBagConstraints.NONE;
-        gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        UndecideAction undecidedAction = new UndecideAction();
-        mergedTable.getSelectionModel().addListSelectionListener(undecidedAction);
-        JButton btnUndecide = new JButton(undecidedAction);
-        btnUndecide.setName("button.undecide");
-        add(btnUndecide, gc);
+        buildRows();
+    }
+
+    private JTable generateTable(TagMergeTableCellRenderer renderer) {
+        return new JTable(model, new TagTableColumnModelBuilder(renderer, KEY_VALUE).build());
+    }
+
+    @Override
+    protected List<? extends MergeRow> getRows() {
+        return Arrays.asList(new TitleRow(), new TagTableRow(), new UndecidedRow());
     }
 
     /**
@@ -252,6 +103,76 @@ public class TagMerger extends JPanel implements IConflictResolver {
         theirTable.getSelectionModel().setSelectionInterval(index, index);
     }
 
+    private final class TagTableRow extends MergeRow {
+        private final AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer();
+
+        /**
+         * embeds table in a new {@link JScrollPane} and returns th scroll pane
+         *
+         * @param table the table
+         * @return the scroll pane embedding the table
+         */
+        JScrollPane embeddInScrollPane(JTable table) {
+            JScrollPane pane = new JScrollPane(table);
+            adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());
+            return pane;
+        }
+
+        @Override
+        protected JComponent mineField() {
+            return embeddInScrollPane(mineTable);
+        }
+
+        @Override
+        protected JComponent mineButton() {
+            KeepMineAction keepMineAction = new KeepMineAction();
+            mineTable.getSelectionModel().addListSelectionListener(keepMineAction);
+            JButton btnKeepMine = new JButton(keepMineAction);
+            btnKeepMine.setName("button.keepmine");
+            return btnKeepMine;
+        }
+
+        @Override
+        protected JComponent merged() {
+            return embeddInScrollPane(mergedTable);
+        }
+
+        @Override
+        protected JComponent theirsButton() {
+            KeepTheirAction keepTheirAction = new KeepTheirAction();
+            theirTable.getSelectionModel().addListSelectionListener(keepTheirAction);
+            JButton btnKeepTheir = new JButton(keepTheirAction);
+            btnKeepTheir.setName("button.keeptheir");
+            return btnKeepTheir;
+        }
+
+        @Override
+        protected JComponent theirsField() {
+            return embeddInScrollPane(theirTable);
+        }
+
+        @Override
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            super.addConstraints(constraints, columnIndex);
+            // Fill to bottom
+            constraints.weighty = 1;
+        }
+    }
+
+    private final class UndecidedRow extends AbstractUndecideRow {
+        @Override
+        protected AbstractAction createAction() {
+            UndecideAction undecidedAction = new UndecideAction();
+            mergedTable.getSelectionModel().addListSelectionListener(undecidedAction);
+            return undecidedAction;
+        }
+
+        @Override
+        protected String getButtonName() {
+            return "button.undecide";
+        }
+    }
+
     /**
      * Keeps the currently selected tags in my table in the list of merged tags.
      *
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java b/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java
index 84f31f3..f5e8fb7 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java
@@ -70,7 +70,7 @@ public class OsmTransferHandler extends AbstractStackTransferHandler {
      * @param transferable The transferable to use.
      */
     public void pasteOn(OsmDataLayer editLayer, EastNorth mPosition, Transferable transferable) {
-        importData(new TransferSupport(Main.panel, transferable), editLayer, mPosition);
+        importData(new TransferSupport(Main.main.panel, transferable), editLayer, mPosition);
     }
 
     /**
@@ -79,7 +79,7 @@ public class OsmTransferHandler extends AbstractStackTransferHandler {
      */
     public void pasteTags(Collection<? extends OsmPrimitive> primitives) {
         Transferable transferable = ClipboardUtils.getClipboardContent();
-        importTags(new TransferSupport(Main.panel, transferable), primitives);
+        importTags(new TransferSupport(Main.main.panel, transferable), primitives);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index fc44813..4b8e494 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -504,7 +504,6 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
             }
             Main.main.undoRedo.add(new SequenceCommand(name, commands));
             refreshView();
-            Main.map.mapView.repaint();
         }
     }
 
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
index c5be067..7253c8d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
@@ -101,7 +101,7 @@ public class ConflictResolutionDialog extends ExtendedDialog implements Property
         resolver.addPropertyChangeListener(this);
         HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
-        setContent(p);
+        setContent(p, false);
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
index 9a54f0d..cbfa170 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
@@ -152,7 +152,7 @@ public class FilterTableModel extends AbstractTableModel {
                     if (primitive.isDisabledAndHidden()) {
                         disabledAndHiddenCount--;
                     }
-                    changed = changed | FilterWorker.executeFilters(primitive, filterMatcher);
+                    changed |= FilterWorker.executeFilters(primitive, filterMatcher);
                     if (primitive.isDisabled()) {
                         disabledCount++;
                     }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java
index 11cb3f9..0793dec 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java
@@ -190,8 +190,8 @@ public class InspectPrimitiveDataText {
         BBox bbox = o.getBBox();
         if (bbox != null) {
             add(tr("Bounding box: "), bbox.toStringCSV(", "));
-            EastNorth bottomRigth = Main.getProjection().latlon2eastNorth(bbox.getBottomRight());
-            EastNorth topLeft = Main.getProjection().latlon2eastNorth(bbox.getTopLeft());
+            EastNorth bottomRigth = bbox.getBottomRight().getEastNorth();
+            EastNorth topLeft = bbox.getTopLeft().getEastNorth();
             add(tr("Bounding box (projected): "),
                     Double.toString(topLeft.east()), ", ",
                     Double.toString(bottomRigth.north()), ", ",
@@ -202,10 +202,10 @@ public class InspectPrimitiveDataText {
     }
 
     void addCoordinates(Node n) {
-        if (n.getCoor() != null) {
+        if (n.isLatLonKnown()) {
             add(tr("Coordinates: "),
-                    Double.toString(n.getCoor().lat()), ", ",
-                    Double.toString(n.getCoor().lon()));
+                    Double.toString(n.lat()), ", ",
+                    Double.toString(n.lon()));
             add(tr("Coordinates (projected): "),
                     Double.toString(n.getEastNorth().east()), ", ",
                     Double.toString(n.getEastNorth().north()));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index e2c4f6d..ee7095d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
@@ -30,10 +30,10 @@ import javax.swing.table.DefaultTableModel;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractInfoAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -50,7 +50,7 @@ import org.openstreetmap.josm.tools.Utils;
  * selection area, along with the number of objects.
  *
  */
-public class UserListDialog extends ToggleDialog implements SelectionChangedListener, ActiveLayerChangeListener {
+public class UserListDialog extends ToggleDialog implements DataSelectionListener, ActiveLayerChangeListener {
 
     /**
      * The display list.
@@ -70,14 +70,14 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
 
     @Override
     public void showNotify() {
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
         Main.getLayerManager().addActiveLayerChangeListener(this);
     }
 
     @Override
     public void hideNotify() {
         Main.getLayerManager().removeActiveLayerChangeListener(this);
-        DataSet.removeSelectionListener(this);
+        SelectionEventManager.getInstance().removeSelectionListener(this);
     }
 
     protected void build() {
@@ -102,18 +102,18 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
         }));
     }
 
-    /**
-     * Called when the selection in the dataset changed.
-     * @param newSelection The new selection array.
-     */
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        refresh(newSelection);
+    public void selectionChanged(SelectionChangeEvent event) {
+        refresh(event.getSelection());
     }
 
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         Layer activeLayer = e.getSource().getActiveLayer();
+        refreshForActiveLayer(activeLayer);
+    }
+
+    private void refreshForActiveLayer(Layer activeLayer) {
         if (activeLayer instanceof OsmDataLayer) {
             refresh(((OsmDataLayer) activeLayer).data.getAllSelected());
         } else {
@@ -126,8 +126,8 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
      * @param fromPrimitives OSM primitives to fetch users from
      */
     public void refresh(Collection<? extends OsmPrimitive> fromPrimitives) {
-        model.populate(fromPrimitives);
         GuiHelper.runInEDT(() -> {
+            model.populate(fromPrimitives);
             if (model.getRowCount() != 0) {
                 setTitle(trn("{0} Author", "{0} Authors", model.getRowCount(), model.getRowCount()));
             } else {
@@ -139,10 +139,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
     @Override
     public void showDialog() {
         super.showDialog();
-        Layer layer = Main.getLayerManager().getActiveLayer();
-        if (layer instanceof OsmDataLayer) {
-            refresh(((OsmDataLayer) layer).data.getAllSelected());
-        }
+        refreshForActiveLayer(Main.getLayerManager().getActiveLayer());
     }
 
     class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener {
@@ -307,6 +304,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
         }
 
         public void populate(Collection<? extends OsmPrimitive> primitives) {
+            GuiHelper.assertCallFromEdt();
             Map<User, Integer> statistics = computeStatistics(primitives);
             data.clear();
             if (primitives != null) {
@@ -315,7 +313,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
                 }
             }
             Collections.sort(data);
-            GuiHelper.runInEDTAndWait(this::fireTableDataChanged);
+            this.fireTableDataChanged();
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index 3af9837..c74b0a0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -480,7 +480,10 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
             fixButton.setEnabled(hasFixes);
 
             if (isDblClick) {
-                Main.getLayerManager().getEditDataSet().setSelected(sel);
+                DataSet ds = Main.getLayerManager().getEditDataSet();
+                if (ds != null) {
+                    ds.setSelected(sel);
+                }
                 if (Main.pref.getBoolean("validator.autozoom", false)) {
                     AutoScaleAction.zoomTo(sel);
                 }
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 5d6d536..44da538 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -59,6 +59,7 @@ import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.ScrollViewport;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAfterSelection;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtEndAction;
@@ -464,7 +465,7 @@ public class GenericRelationEditor extends RelationEditor {
         gc.anchor = GridBagConstraints.NORTHWEST;
         gc.weightx = 0.0;
         gc.weighty = 1.0;
-        pnl.add(leftButtonToolbar, gc);
+        pnl.add(new ScrollViewport(leftButtonToolbar, ScrollViewport.VERTICAL_DIRECTION), gc);
 
         gc.gridx = 1;
         gc.gridy = 1;
@@ -520,7 +521,8 @@ public class GenericRelationEditor extends RelationEditor {
         gc.anchor = GridBagConstraints.NORTHWEST;
         gc.weightx = 0.0;
         gc.weighty = 1.0;
-        pnl2.add(buildSelectionControlButtonToolbar(memberTable, memberTableModel, selectionTableModel, re), gc);
+        pnl2.add(new ScrollViewport(buildSelectionControlButtonToolbar(memberTable, memberTableModel, selectionTableModel, re),
+                ScrollViewport.VERTICAL_DIRECTION), gc);
 
         gc.gridx = 1;
         gc.gridy = 1;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
index 5fd32c7..0cdf451 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
@@ -75,7 +75,6 @@ abstract class SavingAction extends AbstractRelationEditorAction {
 
         // make sure everybody is notified about the changes
         //
-        layer.data.fireSelectionChanged();
         editor.setRelation(newRelation);
         if (editor instanceof RelationEditor) {
             RelationDialogManager.getRelationDialogManager().updateContext(
@@ -107,7 +106,6 @@ abstract class SavingAction extends AbstractRelationEditorAction {
         memberTableModel.applyToRelation(editedRelation);
         if (!editedRelation.hasEqualSemanticAttributes(editor.getRelation(), false)) {
             Main.main.undoRedo.add(new ChangeCommand(editor.getRelation(), editedRelation));
-            layer.data.fireSelectionChanged();
         }
     }
 
diff --git a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
index 13300a0..9754ea7 100644
--- a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
+++ b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
@@ -8,7 +8,7 @@ import java.awt.geom.Path2D;
 import java.awt.geom.PathIterator;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
@@ -56,8 +56,8 @@ public class MapViewPath extends MapPath2D {
      * @param n The node
      * @return this for easy chaining.
      */
-    public MapViewPath moveTo(Node n) {
-        moveTo(n.getEastNorth());
+    public MapViewPath moveTo(ILatLon n) {
+        moveTo(n.getEastNorth(state.getProjecting()));
         return this;
     }
 
@@ -84,8 +84,8 @@ public class MapViewPath extends MapPath2D {
      * @param n The node
      * @return this for easy chaining.
      */
-    public MapViewPath lineTo(Node n) {
-        lineTo(n.getEastNorth());
+    public MapViewPath lineTo(ILatLon n) {
+        lineTo(n.getEastNorth(state.getProjecting()));
         return this;
     }
 
@@ -114,8 +114,8 @@ public class MapViewPath extends MapPath2D {
      * @param size The size of the symbol in pixel
      * @return this for easy chaining.
      */
-    public MapViewPath shapeAround(Node p1, SymbolShape symbol, double size) {
-        shapeAround(p1.getEastNorth(), symbol, size);
+    public MapViewPath shapeAround(ILatLon p1, SymbolShape symbol, double size) {
+        shapeAround(p1.getEastNorth(state.getProjecting()), symbol, size);
         return this;
     }
 
@@ -143,7 +143,7 @@ public class MapViewPath extends MapPath2D {
      * @param connect <code>true</code> if we should use a lineTo as first command.
      * @return this for easy chaining.
      */
-    public MapViewPath append(Iterable<Node> nodes, boolean connect) {
+    public MapViewPath append(Iterable<? extends ILatLon> nodes, boolean connect) {
         appendWay(nodes, connect, false);
         return this;
     }
@@ -154,15 +154,15 @@ public class MapViewPath extends MapPath2D {
      * @param connect <code>true</code> if we should use a lineTo as first command.
      * @return this for easy chaining.
      */
-    public MapViewPath appendClosed(Iterable<Node> nodes, boolean connect) {
+    public MapViewPath appendClosed(Iterable<? extends ILatLon> nodes, boolean connect) {
         appendWay(nodes, connect, true);
         return this;
     }
 
-    private void appendWay(Iterable<Node> nodes, boolean connect, boolean close) {
+    private void appendWay(Iterable<? extends ILatLon> nodes, boolean connect, boolean close) {
         boolean useMoveTo = !connect;
-        Node first = null;
-        for (Node n : nodes) {
+        ILatLon first = null;
+        for (ILatLon n : nodes) {
             if (useMoveTo) {
                 moveTo(n);
             } else {
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index f847735..f001e98 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -8,7 +8,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.text.DateFormat;
@@ -97,20 +96,27 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
         lblInfo = new JMultilineLabel("");
         pnl1.add(lblInfo, BorderLayout.CENTER);
 
-        JPanel pnlUserAndChangeset = new JPanel(new GridLayout(2, 2));
+        // +-----------------------+-------------------------------------+
+        // | User:                 | lblUser                             |
+        // +-----------------------+-------------------------------------+
+        // | changesetButton       | lblChangeset | lblChangesetComments |
+        // +-----------------------+-------------------------------------+
+        JPanel pnlUserAndChangeset = new JPanel(new GridBagLayout());
+        pnlUserAndChangeset.add(new JLabel(tr("User:")), GBC.std());
+
         lblUser = new UrlLabel("", 2);
-        pnlUserAndChangeset.add(new JLabel(tr("User:")));
-        pnlUserAndChangeset.add(lblUser);
-        changesetButton.setMargin(new Insets(0, 0, 0, 0));
-        pnlUserAndChangeset.add(changesetButton);
+        pnlUserAndChangeset.add(lblUser, GBC.eol().insets(5, 0, 0, 0).weight(1, 0));
+
+        changesetButton.setMargin(new Insets(0, 0, 0, 2));
+        pnlUserAndChangeset.add(changesetButton, GBC.std().fill().weight(0, 0));
+
         lblChangeset = new UrlLabel("", 2);
-        final JPanel pnlChangesetInfo = new JPanel(new BorderLayout());
-        pnlChangesetInfo.add(lblChangeset, BorderLayout.CENTER);
+        pnlUserAndChangeset.add(lblChangeset, GBC.std().insets(5, 0, 0, 0).weight(1, 0));
+
         lblChangesetComments.setAction(changesetCommentsDialogAction);
         lblChangesetComments.setMargin(new Insets(0, 0, 0, 0));
         lblChangesetComments.setIcon(new ImageProvider("dialogs/notes/note_comment").setMaxSize(12).get());
-        pnlChangesetInfo.add(lblChangesetComments, BorderLayout.EAST);
-        pnlUserAndChangeset.add(pnlChangesetInfo);
+        pnlUserAndChangeset.add(lblChangesetComments, GBC.eol());
 
         texChangesetComment = buildTextArea(tr("Changeset comment"));
         texChangesetSource = buildTextArea(tr("Changeset source"));
diff --git a/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
index e53f680..4fb1a50 100644
--- a/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
@@ -90,6 +90,7 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
      * @return the map with the current tags in the tag editor model.
      */
     public Map<String, String> getTags(boolean keepEmpty) {
+        forceCommentFieldReload();
         return pnlTagEditor.getModel().getTags(keepEmpty);
     }
 
@@ -110,6 +111,14 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
     }
 
     /**
+     * Force update the fields if the user is currently changing them. See #5676
+     */
+    private void forceCommentFieldReload() {
+        setProperty("comment", changesetCommentModel.getComment());
+        setProperty("source", changesetSourceModel.getComment());
+    }
+
+    /**
      * Observes the changeset comment model and keeps the tag editor in sync
      * with the current changeset comment
      */
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
index 282532e..6e1bc7c 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
@@ -69,18 +69,12 @@ public abstract class AbstractMapViewPaintable implements MapViewPaintable {
         return new CompatibilityModeLayerPainter();
     }
 
-    /**
-     * Adds a new paintable invalidation listener.
-     * @param l The listener to add.
-     */
+    @Override
     public void addInvalidationListener(PaintableInvalidationListener l) {
         invalidationListeners.add(l);
     }
 
-    /**
-     * Removes an added paintable invalidation listener.
-     * @param l The listener to remove.
-     */
+    @Override
     public void removeInvalidationListener(PaintableInvalidationListener l) {
         invalidationListeners.remove(l);
     }
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index c689176..6f20fc2 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -80,6 +80,7 @@ import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -333,18 +334,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
      */
     @Override
     @Deprecated
-    public void displace(double dx, double dy) {
-        getDisplaySettings().addDisplacement(new EastNorth(dx, dy));
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Use {@link TileSourceDisplaySettings}
-     */
-    @Override
-    @Deprecated
-    public void setOffset(double dx, double dy) {
-        getDisplaySettings().setDisplacement(new EastNorth(dx, dy));
+    public void setOffset(OffsetBookmark offset) {
+        getDisplaySettings().setOffsetBookmark(offset);
     }
 
     @Override
@@ -1678,11 +1669,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     public void visitBoundingBox(BoundingXYVisitor v) {
     }
 
-    @Override
-    public boolean isChanged() {
-        return false; // we use #invalidate()
-    }
-
     /**
      * Task responsible for precaching imagery along the gpx track
      *
@@ -1855,6 +1841,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
     @Override
     public void projectionChanged(Projection oldValue, Projection newValue) {
         super.projectionChanged(oldValue, newValue);
+        displaySettings.setOffsetBookmark(displaySettings.getOffsetBookmark());
         if (tileCache != null) {
             tileCache.clear();
         }
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index dd07aa0..09f01d8 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -8,27 +8,22 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.io.File;
 import java.text.DateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -49,18 +44,26 @@ import org.openstreetmap.josm.io.GpxImporter;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
+/**
+ * A layer that displays data from a Gpx file / the OSM gpx downloads.
+ */
 public class GpxLayer extends Layer {
 
     /** GPX data */
     public GpxData data;
     private final boolean isLocalFile;
-    // used by ChooseTrackVisibilityAction to determine which tracks to show/hide
+    /**
+     * used by {@link ChooseTrackVisibilityAction} to determine which tracks to show/hide
+     *
+     * Call {@link #invalidate()} after each change!
+     *
+     * TODO: Make it private, make it respond to track changes.
+     */
     public boolean[] trackVisibility = new boolean[0];
-
-    private final List<GpxTrack> lastTracks = new ArrayList<>(); // List of tracks at last paint
-    private int lastUpdateCount;
-
-    private final GpxDrawHelper drawHelper;
+    /**
+     * Added as field to be kept as reference.
+     */
+    private final GpxDataChangeListener dataChangeListener = e -> this.invalidate();
 
     /**
      * Constructs a new {@code GpxLayer} without name.
@@ -88,9 +91,9 @@ public class GpxLayer extends Layer {
     public GpxLayer(GpxData d, String name, boolean isLocal) {
         super(d.getString(GpxConstants.META_NAME));
         data = d;
-        drawHelper = new GpxDrawHelper(data);
-        SystemOfMeasurement.addSoMChangeListener(drawHelper);
-        ensureTrackVisibilityLength();
+        data.addWeakChangeListener(dataChangeListener);
+        trackVisibility = new boolean[data.getTracks().size()];
+        Arrays.fill(trackVisibility, true);
         setName(name);
         isLocalFile = isLocal;
     }
@@ -145,7 +148,7 @@ public class GpxLayer extends Layer {
             info.append(tr("Description: {0}", data.get(GpxConstants.META_DESC))).append("<br>");
         }
 
-        if (!data.tracks.isEmpty()) {
+        if (!data.getTracks().isEmpty()) {
             info.append("<table><thead align='center'><tr><td colspan='5'>")
                 .append(trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size()))
                 .append("</td></tr><tr align='center'><td>").append(tr("Name")).append("</td><td>")
@@ -153,7 +156,7 @@ public class GpxLayer extends Layer {
                 .append("</td><td>").append(tr("Length")).append("</td><td>").append(tr("URL"))
                 .append("</td></tr></thead>");
 
-            for (GpxTrack trk : data.tracks) {
+            for (GpxTrack trk : data.getTracks()) {
                 info.append("<tr><td>");
                 if (trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
                     info.append(trk.get(GpxConstants.GPX_NAME));
@@ -176,8 +179,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></html>");
+            .append(trn("{0} route, ", "{0} routes, ", data.getRoutes().size(), data.getRoutes().size()))
+            .append(trn("{0} waypoint", "{0} waypoints", data.getWaypoints().size(), data.getWaypoints().size())).append("<br></html>");
 
         final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));
         sp.setPreferredSize(new Dimension(sp.getPreferredSize().width+20, 370));
@@ -234,9 +237,9 @@ public class GpxLayer extends Layer {
             info.append(tr("Description: {0}", data.get(GpxConstants.META_DESC))).append("<br>");
         }
 
-        info.append(trn("{0} track, ", "{0} tracks, ", data.tracks.size(), data.tracks.size()))
-            .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>")
+        info.append(trn("{0} track, ", "{0} tracks, ", data.getTracks().size(), data.getTracks().size()))
+            .append(trn("{0} route, ", "{0} routes, ", data.getRoutes().size(), data.getRoutes().size()))
+            .append(trn("{0} waypoint", "{0} waypoints", data.getWaypoints().size(), data.getWaypoints().size())).append("<br>")
             .append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length())))
             .append("<br></html>");
         return info.toString();
@@ -247,27 +250,17 @@ public class GpxLayer extends Layer {
         return other instanceof GpxLayer;
     }
 
-    private int sumUpdateCount() {
-        int updateCount = 0;
-        for (GpxTrack track: data.tracks) {
-            updateCount += track.getUpdateCount();
-        }
-        return updateCount;
-    }
-
-    @Override
-    public boolean isChanged() {
-        if (data.tracks.equals(lastTracks))
-            return sumUpdateCount() != lastUpdateCount;
-        else
-            return true;
-    }
-
+    /**
+     * Shows/hides all tracks of a given date range by setting them to visible/invisible.
+     * @param fromDate The min date
+     * @param toDate The max date
+     * @param showWithoutDate Include tracks that don't have any date set..
+     */
     public void filterTracksByDate(Date fromDate, Date toDate, boolean showWithoutDate) {
         int i = 0;
         long from = fromDate.getTime();
         long to = toDate.getTime();
-        for (GpxTrack trk : data.tracks) {
+        for (GpxTrack trk : data.getTracks()) {
             Date[] t = GpxData.getMinMaxTimeForTrack(trk);
 
             if (t == null) continue;
@@ -275,6 +268,7 @@ public class GpxLayer extends Layer {
             trackVisibility[i] = (tm == 0 && showWithoutDate) || (from <= tm && tm <= to);
             i++;
         }
+        invalidate();
     }
 
     @Override
@@ -282,54 +276,7 @@ public class GpxLayer extends Layer {
         if (!(from instanceof GpxLayer))
             throw new IllegalArgumentException("not a GpxLayer: " + from);
         data.mergeFrom(((GpxLayer) from).data);
-        drawHelper.dataChanged();
-    }
-
-    @Override
-    public void paint(Graphics2D g, MapView mv, Bounds box) {
-        lastUpdateCount = sumUpdateCount();
-        lastTracks.clear();
-        lastTracks.addAll(data.tracks);
-
-        List<WayPoint> visibleSegments = listVisibleSegments(box);
-        if (!visibleSegments.isEmpty()) {
-            drawHelper.readPreferences(getName());
-            drawHelper.drawAll(g, mv, visibleSegments);
-            if (Main.getLayerManager().getActiveLayer() == this) {
-                drawHelper.drawColorBar(g, mv);
-            }
-        }
-    }
-
-    private List<WayPoint> listVisibleSegments(Bounds box) {
-        WayPoint last = null;
-        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
-
-        ensureTrackVisibilityLength();
-        for (Collection<WayPoint> segment : data.getLinesIterable(trackVisibility)) {
-
-            for (WayPoint pt : segment) {
-                Bounds b = new Bounds(pt.getCoor());
-                if (pt.drawLine && last != null) {
-                    b.extend(last.getCoor());
-                }
-                if (b.intersects(box)) {
-                    if (last != null && (visibleSegments.isEmpty()
-                            || visibleSegments.getLast() != last)) {
-                        if (last.drawLine) {
-                            WayPoint l = new WayPoint(last);
-                            l.drawLine = false;
-                            visibleSegments.add(l);
-                        } else {
-                            visibleSegments.add(last);
-                        }
-                    }
-                    visibleSegments.add(pt);
-                }
-                last = pt;
-            }
-        }
-        return visibleSegments;
+        invalidate();
     }
 
     @Override
@@ -347,20 +294,6 @@ public class GpxLayer extends Layer {
         data.storageFile = file;
     }
 
-    /** ensures the trackVisibility array has the correct length without losing data.
-     * additional entries are initialized to true;
-     */
-    private void ensureTrackVisibilityLength() {
-        final int l = data.tracks.size();
-        if (l == trackVisibility.length)
-            return;
-        final int m = Math.min(l, trackVisibility.length);
-        trackVisibility = Arrays.copyOf(trackVisibility, l);
-        for (int i = m; i < l; i++) {
-            trackVisibility[i] = true;
-        }
-    }
-
     @Override
     public void projectionChanged(Projection oldValue, Projection newValue) {
         if (newValue == null) return;
@@ -388,8 +321,12 @@ public class GpxLayer extends Layer {
     }
 
     @Override
-    public synchronized void destroy() {
-        super.destroy();
-        SystemOfMeasurement.removeSoMChangeListener(drawHelper);
+    public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+        // unused - we use a painter so this is not called.
+    }
+
+    @Override
+    protected LayerPainter createMapViewPainter(MapViewEvent event) {
+        return new GpxDrawHelper(this);
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index c38e54a..fb3fcf9 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -30,6 +30,7 @@ import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -107,23 +108,11 @@ public abstract class ImageryLayer extends Layer {
     /**
      * Sets the displacement offset of this layer. The layer is automatically invalidated.
      * To be removed end of 2016
-     * @param dx The x offset
-     * @param dy The y offset
+     * @param offset the offset bookmark
      * @deprecated Use {@link TileSourceDisplaySettings}
      */
     @Deprecated
-    public void setOffset(double dx, double dy) {
-        // moved to AbstractTileSourceLayer/TileSourceDisplaySettings. Remains until all actions migrate.
-    }
-
-    /**
-     * To be removed end of 2016
-     * @param dx deprecated
-     * @param dy deprecated
-     * @deprecated Use {@link TileSourceDisplaySettings}
-     */
-    @Deprecated
-    public void displace(double dx, double dy) {
+    public void setOffset(OffsetBookmark offset) {
         // moved to AbstractTileSourceLayer/TileSourceDisplaySettings. Remains until all actions migrate.
     }
 
@@ -203,13 +192,13 @@ public abstract class ImageryLayer extends Layer {
         private final transient OffsetBookmark b;
 
         ApplyOffsetAction(OffsetBookmark b) {
-            super(b.name);
+            super(b.getName());
             this.b = b;
         }
 
         @Override
         public void actionPerformed(ActionEvent ev) {
-            setOffset(b.dx, b.dy);
+            setOffset(b);
             Main.main.menu.imageryMenu.refreshOffsetMenu();
             Main.map.repaint();
         }
@@ -252,7 +241,8 @@ public abstract class ImageryLayer extends Layer {
                 continue;
             }
             JCheckBoxMenuItem item = new JCheckBoxMenuItem(new ApplyOffsetAction(b));
-            if (Utils.equalsEpsilon(b.dx, getDx()) && Utils.equalsEpsilon(b.dy, getDy())) {
+            EastNorth offset = b.getDisplacement(Main.getProjection());
+            if (Utils.equalsEpsilon(offset.east(), getDx()) && Utils.equalsEpsilon(offset.north(), getDy())) {
                 item.setSelected(true);
             }
             subMenu.add(item);
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 11247f5..6c025cc 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -109,9 +109,23 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
         }
     }
 
+    /**
+     * The visibility property for this layer. May be <code>true</code> (visible) or <code>false</code> (hidden).
+     */
     public static final String VISIBLE_PROP = Layer.class.getName() + ".visible";
+    /**
+     * The opacity of this layer. A number between 0 and 1
+     */
     public static final String OPACITY_PROP = Layer.class.getName() + ".opacity";
+    /**
+     * The name property of the layer.
+     * You can listen to name changes by listening to changes to this property.
+     */
     public static final String NAME_PROP = Layer.class.getName() + ".name";
+    /**
+     * Property that defines the filter state.
+     * This is currently not used.
+     */
     public static final String FILTER_STATE_PROP = Layer.class.getName() + ".filterstate";
 
     /**
@@ -240,8 +254,19 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
      */
     public abstract boolean isMergable(Layer other);
 
+    /**
+     * Visits the content bounds of this layer. The behavior of this method depends on the layer,
+     * but each implementation should attempt to cover the relevant content of the layer in this method.
+     * @param v The visitor that gets notified about the contents of this layer.
+     */
     public abstract void visitBoundingBox(BoundingXYVisitor v);
 
+    /**
+     * Gets the layer information to display to the user.
+     * This is used if the user requests information about this layer.
+     * It should display a description of the layer content.
+     * @return Either a String or a {@link Component} describing the layer.
+     */
     public abstract Object getInfoComponent();
 
     /**
@@ -280,10 +305,21 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
         removeColorPropertyListener();
     }
 
+    /**
+     * Gets the associated file for this layer.
+     * @return The file or <code>null</code> if it is unset.
+     * @see #setAssociatedFile(File)
+     */
     public File getAssociatedFile() {
         return associatedFile;
     }
 
+    /**
+     * Sets the associated file for this layer.
+     *
+     * The associated file might be the one that the user opened.
+     * @param file The file, may be <code>null</code>
+     */
     public void setAssociatedFile(File file) {
         associatedFile = file;
     }
@@ -470,11 +506,10 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
      * @return True if layer was changed since last paint
      * @deprecated This is not supported by multiple map views.
      * Fire an {@link #invalidate()} to trigger a repaint.
-     * Let this method return false if you only use invalidation events.
      */
     @Deprecated
     public boolean isChanged() {
-        return true;
+        return false;
     }
 
     /**
@@ -502,6 +537,10 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
     public static class LayerSaveAction extends AbstractAction {
         private final transient Layer layer;
 
+        /**
+         * Create a new action that saves the layer
+         * @param layer The layer to save.
+         */
         public LayerSaveAction(Layer layer) {
             putValue(SMALL_ICON, ImageProvider.get("save"));
             putValue(SHORT_DESCRIPTION, tr("Save the current data."));
@@ -516,9 +555,16 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
         }
     }
 
+    /**
+     * Action to save the layer in a new file
+     */
     public static class LayerSaveAsAction extends AbstractAction {
         private final transient Layer layer;
 
+        /**
+         * Create a new save as action
+         * @param layer The layer that should be saved.
+         */
         public LayerSaveAsAction(Layer layer) {
             putValue(SMALL_ICON, ImageProvider.get("save_as"));
             putValue(SHORT_DESCRIPTION, tr("Save the current data to a new file."));
@@ -533,9 +579,16 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
         }
     }
 
+    /**
+     * Action that exports the layer as gpx file
+     */
     public static class LayerGpxExportAction extends AbstractAction {
         private final transient Layer layer;
 
+        /**
+         * Create a new gpx export action for the given layer.
+         * @param layer The layer
+         */
         public LayerGpxExportAction(Layer layer) {
             putValue(SMALL_ICON, ImageProvider.get("exportgpx"));
             putValue(SHORT_DESCRIPTION, tr("Export the data to GPX file."));
diff --git a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
index 0aea51d..ac53a3d 100644
--- a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
+++ b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
@@ -141,4 +141,21 @@ public interface MapViewPaintable {
      * @param bbox Bounding box
      */
     void paint(Graphics2D g, MapView mv, Bounds bbox);
+
+    /**
+     * Adds a new paintable invalidation listener.
+     * @param l The listener to add.
+     * @since 12107
+     */
+    default void addInvalidationListener(PaintableInvalidationListener l) {
+    }
+
+    /**
+     * Removes an added paintable invalidation listener. May throw an exception if the listener is added twice.
+     * @param l The listener to remove.
+     * @since 12107
+     */
+    default void removeInvalidationListener(PaintableInvalidationListener l) {
+    }
+
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
index 72f7ee5..d6e59a5 100644
--- a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
@@ -259,6 +259,7 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
             }
         }
         noteData.setSelectedNote(closestNote);
+        invalidate();
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 5996995..c6bacfb 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -50,7 +50,6 @@ import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -61,6 +60,7 @@ import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -107,7 +107,6 @@ import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -117,7 +116,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
  * @author imi
  * @since 17
  */
-public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener, HighlightUpdateListener {
+public class OsmDataLayer extends AbstractModifiableLayer implements Listener, DataSelectionListener, HighlightUpdateListener {
     private static final int HATCHED_SIZE = 15;
     /** Property used to know if this layer has to be saved on disk */
     public static final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
@@ -133,9 +132,20 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
      */
     public final List<TestError> validationErrors = new ArrayList<>();
 
+    /**
+     * The default number of relations in the recent relations cache.
+     * @see #getRecentRelations()
+     */
     public static final int DEFAULT_RECENT_RELATIONS_NUMBER = 20;
+    /**
+     * The number of relations to use in the recent relations cache.
+     * @see #getRecentRelations()
+     */
     public static final IntegerProperty PROPERTY_RECENT_RELATIONS_NUMBER = new IntegerProperty("properties.last-closed-relations-size",
             DEFAULT_RECENT_RELATIONS_NUMBER);
+    /**
+     * The extension that should be used when saving the OSM file.
+     */
     public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm");
 
     private static final ColorProperty PROPERTY_BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
@@ -158,6 +168,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     /**
      * Adds recently closed relation.
      * @param relation new entry for the list of recently closed relations
+     * @see #PROPERTY_RECENT_RELATIONS_NUMBER
      * @since 9668
      */
     public void setRecentRelation(Relation relation) {
@@ -222,12 +233,33 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
         }
     }
 
+    /**
+     * A listener that counts the number of primitives it encounters
+     */
     public static final class DataCountVisitor extends AbstractVisitor {
+        /**
+         * Nodes that have been visited
+         */
         public int nodes;
+        /**
+         * Ways that have been visited
+         */
         public int ways;
+        /**
+         * Relations that have been visited
+         */
         public int relations;
+        /**
+         * Deleted nodes that have been visited
+         */
         public int deletedNodes;
+        /**
+         * Deleted ways that have been visited
+         */
         public int deletedWays;
+        /**
+         * Deleted relations that have been visited
+         */
         public int deletedRelations;
 
         @Override
@@ -255,8 +287,16 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
         }
     }
 
+    /**
+     * A listener that gets notified of command queue (undo/redo) size changes.
+     */
     @FunctionalInterface
     public interface CommandQueueListener {
+        /**
+         * Notifies the listener about the new queue size
+         * @param queueSize Undo stack size
+         * @param redoSize Redo stack size
+         */
         void commandChanged(int queueSize, int redoSize);
     }
 
@@ -364,7 +404,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
         data.addDataSetListener(new DataSetListenerAdapter(this));
         data.addDataSetListener(MultipolygonCache.getInstance());
         data.addHighlightUpdateListener(this);
-        DataSet.addSelectionListener(this);
+        data.addSelectionListener(this);
         if (name != null && name.startsWith(createLayerName("")) && Character.isDigit(
                 (name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {
             while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
@@ -439,19 +479,27 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     }
 
     @Override public String getToolTipText() {
-        int nodes = new SubclassFilteredCollection<>(data.getNodes(), p -> !p.isDeleted()).size();
-        int ways = new SubclassFilteredCollection<>(data.getWays(), p -> !p.isDeleted()).size();
-        int rels = new SubclassFilteredCollection<>(data.getRelations(), p -> !p.isDeleted()).size();
+        DataCountVisitor counter = new DataCountVisitor();
+        for (final OsmPrimitive osm : data.allPrimitives()) {
+            osm.accept(counter);
+        }
+        int nodes = counter.nodes - counter.deletedNodes;
+        int ways = counter.ways - counter.deletedWays;
+        int rels = counter.relations - counter.deletedRelations;
 
-        String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";
-        tool += trn("{0} way", "{0} ways", ways, ways)+", ";
-        tool += trn("{0} relation", "{0} relations", rels, rels);
+        StringBuilder tooltip = new StringBuilder("<html>")
+                .append(trn("{0} node", "{0} nodes", nodes, nodes))
+                .append("<br>")
+                .append(trn("{0} way", "{0} ways", ways, ways))
+                .append("<br>")
+                .append(trn("{0} relation", "{0} relations", rels, rels));
 
         File f = getAssociatedFile();
         if (f != null) {
-            tool = "<html>"+tool+"<br>"+f.getPath()+"</html>";
+            tooltip.append("<br>").append(f.getPath());
         }
-        return tool;
+        tooltip.append("</html>");
+        return tooltip.toString();
     }
 
     @Override public void mergeFrom(final Layer from) {
@@ -518,9 +566,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
             }
         }
         // repaint to make sure new data is displayed properly.
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
-        }
+        invalidate();
         // warn about new conflicts
         if (numNewConflicts > 0 && Main.map != null && Main.map.conflictDialog != null) {
             Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts);
@@ -692,7 +738,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
                 trkseg.add(nodeToWayPoint(n));
             }
 
-            gpxData.tracks.add(new ImmutableGpxTrack(trk, trkAttr));
+            gpxData.addTrack(new ImmutableGpxTrack(trk, trkAttr));
         });
     }
 
@@ -944,7 +990,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     @Override
     public synchronized void destroy() {
         super.destroy();
-        DataSet.removeSelectionListener(this);
+        data.removeSelectionListener(this);
         data.removeHighlightUpdateListener(this);
     }
 
@@ -956,7 +1002,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
     }
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
         invalidate();
     }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 50fbd6d..6c34777 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -18,8 +18,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 import java.awt.image.BufferedImage;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -74,7 +72,8 @@ import org.openstreetmap.josm.tools.Utils;
 /**
  * Layer displaying geottaged pictures.
  */
-public class GeoImageLayer extends AbstractModifiableLayer implements PropertyChangeListener, JumpToMarkerLayer {
+public class GeoImageLayer extends AbstractModifiableLayer implements
+        JumpToMarkerLayer, NavigatableComponent.ZoomChangeListener {
 
     private static List<Action> menuAdditions = new LinkedList<>();
 
@@ -589,14 +588,14 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
                     double leftdir = (headdir < 90) ? headdir + 270 : headdir - 90;
                     double rightdir = (headdir > 270) ? headdir - 270 : headdir + 90;
 
-                    double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength;
-                    double pty = p.y + Math.sin(Math.toRadians(headdir)) * arrowlength;
+                    double ptx = p.x + Math.cos(Utils.toRadians(headdir)) * arrowlength;
+                    double pty = p.y + Math.sin(Utils.toRadians(headdir)) * arrowlength;
 
-                    double ltx = p.x + Math.cos(Math.toRadians(leftdir)) * arrowwidth/2;
-                    double lty = p.y + Math.sin(Math.toRadians(leftdir)) * arrowwidth/2;
+                    double ltx = p.x + Math.cos(Utils.toRadians(leftdir)) * arrowwidth/2;
+                    double lty = p.y + Math.sin(Utils.toRadians(leftdir)) * arrowwidth/2;
 
-                    double rtx = p.x + Math.cos(Math.toRadians(rightdir)) * arrowwidth/2;
-                    double rty = p.y + Math.sin(Math.toRadians(rightdir)) * arrowwidth/2;
+                    double rtx = p.x + Math.cos(Utils.toRadians(rightdir)) * arrowwidth/2;
+                    double rty = p.y + Math.sin(Utils.toRadians(rightdir)) * arrowwidth/2;
 
                     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                     g.setColor(new Color(255, 255, 255, 192));
@@ -1025,7 +1024,6 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
             }
         });
 
-        Main.map.mapView.addPropertyChangeListener(this);
         if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
             ImageViewerDialog.newInstance();
             Main.map.addToggleDialog(ImageViewerDialog.getInstance());
@@ -1033,11 +1031,14 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
     }
 
     @Override
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) ||
-                NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) {
-            updateOffscreenBuffer = true;
-        }
+    public LayerPainter attachToMapView(MapViewEvent event) {
+        MapView.addZoomChangeListener(this);
+        return super.attachToMapView(event);
+    }
+
+    @Override
+    public void zoomChanged() {
+        updateOffscreenBuffer = true;
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
index 3618447..f789bce 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
@@ -217,8 +217,7 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
         for (int i = 0; i < layer.trackVisibility.length; i++) {
             layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);
         }
-        Main.map.mapView.preferenceChanged(null);
-        Main.map.repaint(100);
+        layer.invalidate();
     }
 
     @Override
@@ -230,8 +229,7 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
             noUpdates = true;
             selectVisibleTracksInTable();
             noUpdates = false;
-            Main.map.mapView.preferenceChanged(null);
-            Main.map.repaint(100);
+            layer.invalidate();
         });
         dateFilter.loadFromPrefs();
 
@@ -291,14 +289,9 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
         for (int i = 0; i < layer.trackVisibility.length; i++) {
             layer.trackVisibility[table.convertRowIndexToModel(i)] = all || s.isSelectedIndex(i);
         }
+        // layer has been changed
+        layer.invalidate();
         // ...sync with layer visibility instead to avoid having two ways to hide everything
         layer.setVisible(v == 1 || !s.isSelectionEmpty());
-
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.preferenceChanged(null);
-        }
-        if (Main.map != null) {
-            Main.map.repaint();
-        }
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index 1484d32..3df1039 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -73,7 +73,7 @@ public abstract class ConvertToDataLayerAction<T extends Layer> extends Abstract
         @Override
         public DataSet convert() {
             final DataSet ds = new DataSet();
-            for (GpxTrack trk : layer.data.tracks) {
+            for (GpxTrack trk : layer.data.getTracks()) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
                     List<Node> nodes = new ArrayList<>();
                     for (WayPoint p : segment.getWayPoints()) {
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
index 95eaf64..396209d 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
@@ -17,6 +17,7 @@ import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Action that issues a series of download requests to the API, following the GPX track.
@@ -69,7 +70,7 @@ public class DownloadAlongTrackAction extends DownloadAlongAction {
             for (GpxTrack trk : data.tracks) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
                     for (WayPoint p : segment.getWayPoints()) {
-                        latsum += p.getCoor().lat();
+                        latsum += p.lat();
                         latcnt++;
                     }
                 }
@@ -85,7 +86,7 @@ public class DownloadAlongTrackAction extends DownloadAlongAction {
             return null;
         }
         double avglat = latsum / latcnt;
-        double scale = Math.cos(Math.toRadians(avglat));
+        double scale = Math.cos(Utils.toRadians(avglat));
         /*
          * Compute buffer zone extents and maximum bounding box size. Note that the maximum we
          * ever offer is a bbox area of 0.002, while the API theoretically supports 0.25, but as
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
index 988cf53..8fb55b7 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
@@ -26,12 +26,14 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
 import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -41,6 +43,12 @@ import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.MapViewGraphics;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.MapViewEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ColorScale;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -50,7 +58,7 @@ import org.openstreetmap.josm.tools.Utils;
  * Class that helps to draw large set of GPS tracks with different colors and options
  * @since 7319
  */
-public class GpxDrawHelper implements SoMChangeListener {
+public class GpxDrawHelper implements SoMChangeListener, MapViewPaintable.LayerPainter, PaintableInvalidationListener {
 
     /**
      * The color that is used for drawing GPX points.
@@ -59,6 +67,7 @@ public class GpxDrawHelper implements SoMChangeListener {
     public static final ColorProperty DEFAULT_COLOR = new ColorProperty(marktr("gps point"), Color.magenta);
 
     private final GpxData data;
+    private final GpxLayer layer;
 
     // draw lines between points belonging to different segments
     private boolean forceLines;
@@ -85,7 +94,7 @@ public class GpxDrawHelper implements SoMChangeListener {
     /** maximum value of displayed HDOP, minimum is 0 */
     private int hdoprange;
 
-    private static final double PHI = Math.toRadians(15);
+    private static final double PHI = Utils.toRadians(15);
 
     //// Variables used only to check cache validity
     private boolean computeCacheInSync;
@@ -166,6 +175,9 @@ public class GpxDrawHelper implements SoMChangeListener {
     // user defined heatmap color
     private Color[] heatMapLutColor = createColorLut(0, Color.BLACK, Color.WHITE);
 
+    // The heat map was invalidated since the last draw.
+    private boolean gpxLayerInvalidated;
+
     private void setupColors() {
         hdopAlpha = Main.pref.getInteger("hdop.color.alpha", -1);
         velocityScale = ColorScale.createHSBScale(256);
@@ -181,9 +193,7 @@ public class GpxDrawHelper implements SoMChangeListener {
     public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
         SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();
         velocityScale.addTitle(tr("Velocity, {0}", som.speedName));
-        if (oldSoM != null && newSoM != null && Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
-        }
+        layer.invalidate();
     }
 
     /**
@@ -203,11 +213,15 @@ public class GpxDrawHelper implements SoMChangeListener {
 
     /**
      * Constructs a new {@code GpxDrawHelper}.
-     * @param gpxData GPX data
-     * @since 11713
+     * @param gpxLayer The layer to draw
+     * @since 12157
      */
-    public GpxDrawHelper(GpxData gpxData) {
-        data = gpxData;
+    public GpxDrawHelper(GpxLayer gpxLayer) {
+        layer = gpxLayer;
+        data = gpxLayer.data;
+
+        layer.addInvalidationListener(this);
+        SystemOfMeasurement.addSoMChangeListener(this);
         setupColors();
     }
 
@@ -302,6 +316,64 @@ public class GpxDrawHelper implements SoMChangeListener {
         largesize += lineWidth;
     }
 
+    @Override
+    public void paint(MapViewGraphics graphics) {
+        List<WayPoint> visibleSegments = listVisibleSegments(graphics.getClipBounds().getLatLonBoundsBox());
+        if (!visibleSegments.isEmpty()) {
+            readPreferences(layer.getName());
+            drawAll(graphics.getDefaultGraphics(), graphics.getMapView(), visibleSegments);
+            if (graphics.getMapView().getLayerManager().getActiveLayer() == layer) {
+                drawColorBar(graphics.getDefaultGraphics(), graphics.getMapView());
+            }
+        }
+    }
+
+    private List<WayPoint> listVisibleSegments(Bounds box) {
+        WayPoint last = null;
+        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
+
+        ensureTrackVisibilityLength();
+        for (Collection<WayPoint> segment : data.getLinesIterable(layer.trackVisibility)) {
+
+            for (WayPoint pt : segment) {
+                Bounds b = new Bounds(pt.getCoor());
+                if (pt.drawLine && last != null) {
+                    b.extend(last.getCoor());
+                }
+                if (b.intersects(box)) {
+                    if (last != null && (visibleSegments.isEmpty()
+                            || visibleSegments.getLast() != last)) {
+                        if (last.drawLine) {
+                            WayPoint l = new WayPoint(last);
+                            l.drawLine = false;
+                            visibleSegments.add(l);
+                        } else {
+                            visibleSegments.add(last);
+                        }
+                    }
+                    visibleSegments.add(pt);
+                }
+                last = pt;
+            }
+        }
+        return visibleSegments;
+    }
+
+    /** ensures the trackVisibility array has the correct length without losing data.
+     * TODO: Make this nicer by syncing the trackVisibility automatically.
+     * additional entries are initialized to true;
+     */
+    private void ensureTrackVisibilityLength() {
+        final int l = data.getTracks().size();
+        if (l == layer.trackVisibility.length)
+            return;
+        final int m = Math.min(l, layer.trackVisibility.length);
+        layer.trackVisibility = Arrays.copyOf(layer.trackVisibility, l);
+        for (int i = m; i < l; i++) {
+            layer.trackVisibility[i] = true;
+        }
+    }
+
     /**
      * Draw all enabled GPX elements of layer.
      * @param g               the common draw object to use
@@ -402,12 +474,11 @@ public class GpxDrawHelper implements SoMChangeListener {
                         oldWp = null;
                     }
                     for (WayPoint trkPnt : segment) {
-                        LatLon c = trkPnt.getCoor();
-                        if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
+                        if (!trkPnt.isLatLonKnown()) {
                             continue;
                         }
                         if (oldWp != null && trkPnt.time > oldWp.time) {
-                            double vel = c.greatCircleDistance(oldWp.getCoor())
+                            double vel = trkPnt.getCoor().greatCircleDistance(oldWp.getCoor())
                                     / (trkPnt.time - oldWp.time);
                             velocities.add(vel);
                         }
@@ -548,8 +619,8 @@ public class GpxDrawHelper implements SoMChangeListener {
         if (lines) {
             Point old = null;
             for (WayPoint trkPnt : visibleSegments) {
-                LatLon c = trkPnt.getCoor();
-                if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
+                if (!trkPnt.isLatLonKnown()) {
+                    old = null;
                     continue;
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
@@ -577,8 +648,8 @@ public class GpxDrawHelper implements SoMChangeListener {
             Point old = null;
             Point oldA = null; // last arrow painted
             for (WayPoint trkPnt : visibleSegments) {
-                LatLon c = trkPnt.getCoor();
-                if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
+                if (!trkPnt.isLatLonKnown()) {
+                    old = null;
                     continue;
                 }
                 if (trkPnt.drawLine) {
@@ -649,7 +720,6 @@ public class GpxDrawHelper implements SoMChangeListener {
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
 
-
                 if (hdopCircle && trkPnt.get(GpxConstants.PT_HDOP) != null) {
                     // hdop value
                     float hdop = (Float) trkPnt.get(GpxConstants.PT_HDOP);
@@ -1202,8 +1272,9 @@ public class GpxDrawHelper implements SoMChangeListener {
         // 3rd Calculate the heat map data by draw GPX traces with alpha value ----------
 
         // recalculation of image needed
-        final boolean imageRecalc = !mapViewState.equalsInWindow(heatMapMapViewState) ||
-                                    heatMapCacheLineWith != globalLineWidth;
+        final boolean imageRecalc = !mapViewState.equalsInWindow(heatMapMapViewState)
+                || gpxLayerInvalidated
+                || heatMapCacheLineWith != globalLineWidth;
 
         // need re-generation of gray image ?
         if (imageSetup || imageRecalc) {
@@ -1227,6 +1298,7 @@ public class GpxDrawHelper implements SoMChangeListener {
             // remember draw parameter
             heatMapMapViewState = mapViewState;
             heatMapCacheLineWith = globalLineWidth;
+            gpxLayerInvalidated = false;
         }
 
         // 4th. Draw data on target layer, map data via color lookup table --------------
@@ -1401,4 +1473,15 @@ public class GpxDrawHelper implements SoMChangeListener {
             directionScale.drawColorBar(g, w-30, 50, 20, 100, 180.0/Math.PI);
         }
     }
+
+    @Override
+    public void paintableInvalidated(PaintableInvalidationEvent event) {
+        gpxLayerInvalidated = true;
+    }
+
+    @Override
+    public void detachFromMapView(MapViewEvent event) {
+        SystemOfMeasurement.removeSoMChangeListener(this);
+        layer.removeInvalidationListener(this);
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
index 0c52a12..47cb087 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
@@ -10,9 +10,6 @@ import javax.swing.AbstractAction;
 
 import org.openstreetmap.josm.Main;
 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.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -29,15 +26,9 @@ public class MarkersFromNamedPointsAction extends AbstractAction {
     @Override
     public void actionPerformed(ActionEvent e) {
         GpxData namedTrackPoints = new GpxData();
-        for (GpxTrack track : layer.data.tracks) {
-            for (GpxTrackSegment seg : track.getSegments()) {
-                for (WayPoint point : seg.getWayPoints()) {
-                    if (point.attr.containsKey("name") || point.attr.containsKey("desc")) {
-                        namedTrackPoints.waypoints.add(point);
-                    }
-                }
-            }
-        }
+        layer.data.getTrackPoints()
+            .filter(point -> point.attr.containsKey("name") || point.attr.containsKey("desc"))
+            .forEach(namedTrackPoints.waypoints::add);
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
         if (!ml.data.isEmpty()) {
             Main.getLayerManager().addLayer(ml);
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java
index 9978005..feaff66 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java
@@ -31,7 +31,7 @@ public class ColorfulFilter implements BufferedImageOp {
 
     @Override
     public BufferedImage filter(BufferedImage src, BufferedImage dst) {
-        if (src.getWidth() == 0 || src.getHeight() == 0) {
+        if (src.getWidth() == 0 || src.getHeight() == 0 || src.getType() == BufferedImage.TYPE_CUSTOM) {
             return src;
         }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java b/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
index 1647697..fa17478 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
@@ -64,7 +64,7 @@ public class ReprojectionTile extends Tile {
      * @param currentScale the current mapview scale
      * @return true if the tile should be reprojected again from the source image.
      */
-    public boolean needsUpdate(double currentScale) {
+    public synchronized boolean needsUpdate(double currentScale) {
         if (Utils.equalsEpsilon(nativeScale, currentScale))
             return false;
         return !maxZoomReached || currentScale >= nativeScale;
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
index 5690afe..be27608 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
@@ -7,6 +7,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -61,10 +62,12 @@ public class TileSourceDisplaySettings {
     /** if layer should show errors on tiles */
     private boolean showErrors;
 
+    private OffsetBookmark offsetBookmark;
     /**
-     * The displacement
+     * the displacement (basically caches the displacement from the offsetBookmark
+     * in the current projection)
      */
-    private EastNorth displacement = new EastNorth(0, 0);
+    private EastNorth displacement = EastNorth.ZERO;
 
     private final CopyOnWriteArrayList<DisplaySettingsChangeListener> listeners = new CopyOnWriteArrayList<>();
 
@@ -188,24 +191,31 @@ public class TileSourceDisplaySettings {
     }
 
     /**
-     * Set the displacement
-     * @param displacement The new displacement
-     * @since 10571
+     * Sets an offset bookmark to use.
+     *
+     * @param offsetBookmark the offset bookmark, may be null
      */
-    public void setDisplacement(EastNorth displacement) {
-        CheckParameterUtil.ensureValidCoordinates(displacement, "displacement");
-        this.displacement = displacement;
-        fireSettingsChange(DISPLACEMENT);
+    public void setOffsetBookmark(OffsetBookmark offsetBookmark) {
+        this.offsetBookmark = offsetBookmark;
+        if (offsetBookmark == null) {
+            setDisplacement(EastNorth.ZERO);
+        } else {
+            setDisplacement(offsetBookmark.getDisplacement(Main.getProjection()));
+        }
     }
 
     /**
-     * Adds the given value to the displacement.
-     * @param displacement The value to add.
-     * @since 10571
+     * Gets the offset bookmark in use.
+     * @return the offset bookmark, may be null
      */
-    public void addDisplacement(EastNorth displacement) {
+    public OffsetBookmark getOffsetBookmark() {
+        return this.offsetBookmark;
+    }
+
+    private void setDisplacement(EastNorth displacement) {
         CheckParameterUtil.ensureValidCoordinates(displacement, "displacement");
-        setDisplacement(this.displacement.add(displacement));
+        this.displacement = displacement;
+        fireSettingsChange(DISPLACEMENT);
     }
 
     /**
@@ -237,21 +247,23 @@ public class TileSourceDisplaySettings {
 
     /**
      * Stores the current settings object to the given hashmap.
+     * The offset data is not stored and needs to be handled separately.
      * @param data The map to store the settings to.
      * @see #loadFrom(Map)
+     * @see OffsetBookmark#toPropertiesMap()
      */
     public void storeTo(Map<String, String> data) {
         data.put(AUTO_LOAD, Boolean.toString(autoLoad));
         data.put(AUTO_ZOOM, Boolean.toString(autoZoom));
         data.put(SHOW_ERRORS, Boolean.toString(showErrors));
-        data.put("dx", String.valueOf(getDx()));
-        data.put("dy", String.valueOf(getDy()));
     }
 
     /**
      * Load the settings from the given data instance.
+     * The offset data is not loaded and needs to be handled separately.
      * @param data The data
      * @see #storeTo(Map)
+     * @see OffsetBookmark#fromPropertiesMap(java.util.Map)
      */
     public void loadFrom(Map<String, String> data) {
         try {
@@ -269,12 +281,6 @@ public class TileSourceDisplaySettings {
             if (doShowErrors != null) {
                 setShowErrors(Boolean.parseBoolean(doShowErrors));
             }
-
-            String dx = data.get("dx");
-            String dy = data.get("dy");
-            if (dx != null && dy != null) {
-                setDisplacement(new EastNorth(Double.parseDouble(dx), Double.parseDouble(dy)));
-            }
         } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("data", data);
         }
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index ade725c..34892f4 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -567,7 +567,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
             if (playHeadMarker == null)
                 return;
             addAudioMarker(playHeadMarker.time, playHeadMarker.getCoor());
-            Main.map.mapView.repaint();
+            invalidate();
         }
     }
 }
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
index d0620f4..54ca3e4 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -316,7 +316,7 @@ public final class PlayHeadMarker extends Marker {
         WayPoint w1 = null;
         WayPoint w2 = null;
 
-        for (GpxTrack track : trackLayer.data.tracks) {
+        for (GpxTrack track : trackLayer.data.getTracks()) {
             for (GpxTrackSegment trackseg : track.getSegments()) {
                 for (WayPoint w: trackseg.getWayPoints()) {
                     if (audioTime < w.time) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
index 08be6b1..9295f96 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -23,6 +23,8 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
@@ -339,10 +341,12 @@ public final class MapPaintStyles {
             SwingUtilities.invokeLater(() -> {
                 fireMapPaintSylesUpdated();
                 styles.clearCached();
-                if (Main.isDisplayingMapView()) {
-                    Main.map.mapView.preferenceChanged(null);
-                    Main.map.mapView.repaint();
-                }
+
+                // Trigger a repaint of all data layers
+                Main.getLayerManager().getLayers()
+                    .stream()
+                    .filter(layer -> layer instanceof OsmDataLayer)
+                    .forEach(Layer::invalidate);
             });
         }
 
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
index 5cb5065..aea9351 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
@@ -1,6 +1,13 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
 
+/**
+ * Interface defining string constants (MapCSS property keys).
+ * 
+ * For the implementation of the <code>@supports</code> feature, the list of
+ * supported keys is loaded from this interface using reflection.
+ * @see org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource#evalSupportsDeclCondition(java.lang.String, java.lang.Object)
+ */
 public interface StyleKeys {
 
     String COLOR = "color";
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
index 4c658a7..8011ffe 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
@@ -5,6 +5,11 @@ import java.awt.Color;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * List of named CSS colors as per CSS Color Module Level 3.
+ * 
+ * @see <a href="https://drafts.csswg.org/css-color-3/">CSS Color Module Level 3</a>
+ */
 public final class CSSColors {
     private static final Map<String, Color> CSS_COLORS = new HashMap<>();
     static {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
index aa34d2c..ab8091b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -823,7 +822,7 @@ public final class ConditionFactory {
         public boolean applies(Environment e) {
             try {
                 return not ^ (Boolean) method.invoke(null, e);
-            } catch (IllegalAccessException | InvocationTargetException ex) {
+            } catch (ReflectiveOperationException ex) {
                 throw new JosmRuntimeException(ex);
             }
         }
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index 25e36af..e2b4e15 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -619,7 +619,7 @@ public final class ExpressionFactory {
          * @see Math#toRadians(double)
          */
         public static double degree_to_radians(double degree) { // NO_UCD (unused code)
-            return Math.toRadians(degree);
+            return Utils.toRadians(degree);
         }
 
         /**
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
index da523d0..d137542 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
@@ -10,9 +10,20 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 
+/**
+ * A MapCSS Instruction.
+ * 
+ * For example a simple assignment like <code>width: 3;</code>, but may also
+ * be a set instruction (<code>set highway;</code>).
+ * A MapCSS {@link MapCSSRule.Declaration} is a list of instructions.
+ */
 @FunctionalInterface
 public interface Instruction extends StyleKeys {
 
+    /**
+     * Execute the instruction in the given environment.
+     * @param env the environment
+     */
     void execute(Environment env);
 
     class RelativeFloat {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
index 6b31752..8dbb5fc 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
@@ -30,14 +30,14 @@ public class LineElement extends StyleElement {
      */
     public static final LineElement UNTAGGED_WAY = createSimpleLineStyle(null, false);
 
-    private BasicStroke line;
+    private final BasicStroke line;
     public Color color;
     public Color dashesBackground;
     public float offset;
     public float realWidth; // the real width of this line in meter
     public boolean wayDirectionArrows;
 
-    private BasicStroke dashesLine;
+    private final BasicStroke dashesLine;
 
     public enum LineType {
         NORMAL("", 3f),
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
index ca9a254..dd55a94 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
@@ -12,6 +12,9 @@ import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * Style element that displays a repeated image pattern along a way.
+ */
 public class RepeatImageElement extends StyleElement {
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
index 4349e3c..a17a7e9 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
@@ -15,6 +15,14 @@ import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
 
+/**
+ * Class that defines how objects ({@link OsmPrimitive}) should be drawn on the map.
+ * 
+ * Several subclasses of this abstract class implement different drawing features,
+ * like icons for a node or area fill. This class and all its subclasses are immutable
+ * and tend to get shared when multiple objects have the same style (in order to
+ * save memory, see {@link org.openstreetmap.josm.gui.mappaint.StyleCache#intern()}).
+ */
 public abstract class StyleElement implements StyleKeys {
 
     protected static final int ICON_IMAGE_IDX = 0;
@@ -31,6 +39,15 @@ public abstract class StyleElement implements StyleKeys {
     // primitive; true, if it is a highlight or modifier
     public boolean defaultSelectedHandling;
 
+    /**
+     * Construct a new StyleElement
+     * @param majorZindex like z-index, but higher priority
+     * @param zIndex order the objects are drawn
+     * @param objectZindex like z-index, but lower priority
+     * @param isModifier if false, a default line or node symbol is generated
+     * @param defaultSelectedHandling true if default behavior for selected objects
+     * is enabled, false if a style for selected state is given explicitly
+     */
     public StyleElement(float majorZindex, float zIndex, float objectZindex, boolean isModifier, boolean defaultSelectedHandling) {
         this.majorZIndex = majorZindex;
         this.zIndex = zIndex;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
index f4474d4..1fb1746 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
@@ -76,7 +76,7 @@ public class TextLabel implements StyleKeys {
      */
     @Deprecated
     public TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
-        this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, new CompletelyInsideAreaStrategy());
+        this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, CompletelyInsideAreaStrategy.INSTANCE);
     }
 
     /**
@@ -253,7 +253,7 @@ public class TextLabel implements StyleKeys {
 
     @Override
     public String toString() {
-        return "TextElement{" + toStringImpl() + '}';
+        return "TextLabel{" + toStringImpl() + '}';
     }
 
     protected String toStringImpl() {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
index 486aa24..afeca54 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
@@ -21,6 +21,9 @@ public class CompletelyInsideAreaStrategy implements PositionForAreaStrategy {
      */
     public static final CompletelyInsideAreaStrategy INSTANCE = new CompletelyInsideAreaStrategy();
 
+    protected CompletelyInsideAreaStrategy() {
+    }
+
     @Override
     public MapViewPositionAndRotation findLabelPlacement(MapViewPath path, Rectangle2D nb) {
         // Using the Centroid is Nicer for buildings like: +--------+
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
index 778c536..7ce9aae 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
@@ -15,12 +15,15 @@ import org.openstreetmap.josm.gui.draw.MapViewPositionAndRotation;
  * @since 11722
  * @since 11748 moved to own file
  */
-public class PartiallyInsideAreaStrategy extends CompletelyInsideAreaStrategy {
+public final class PartiallyInsideAreaStrategy extends CompletelyInsideAreaStrategy {
     /**
      * An instance of this class.
      */
     public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy();
 
+    private PartiallyInsideAreaStrategy() {
+    }
+
     @Override
     public MapViewPositionAndRotation findLabelPlacement(MapViewPath path, Rectangle2D nb) {
         MapViewPositionAndRotation inside = super.findLabelPlacement(path, nb);
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
index 7b74e48..236b896 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.CookieHandler;
 import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
@@ -88,19 +87,6 @@ public class OsmOAuthAuthorizationClient {
      */
     public void cancel() {
         canceled = true;
-        if (provider != null) {
-            try {
-                Field f = provider.getClass().getDeclaredField("connection");
-                Utils.setObjectsAccessible(f);
-                HttpURLConnection con = (HttpURLConnection) f.get(provider);
-                if (con != null) {
-                    con.disconnect();
-                }
-            } catch (NoSuchFieldException | SecurityException | IllegalAccessException e) {
-                Main.error(e);
-                Main.warn(tr("Failed to cancel running OAuth operation"));
-            }
-        }
         synchronized (this) {
             if (connection != null) {
                 connection.disconnect();
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 54d686b..029649a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -68,6 +68,7 @@ import org.openstreetmap.josm.actions.ParameterizedActionDecorator;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -994,8 +995,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
      * Constructs a new {@code ToolbarPreferences}.
      */
     public ToolbarPreferences() {
-        control.setFloatable(false);
-        control.setComponentPopupMenu(popupMenu);
+        GuiHelper.runInEDTAndWait(() -> {
+            control.setFloatable(false);
+            control.setComponentPopupMenu(popupMenu);
+        });
         Main.pref.addPreferenceChangeListener(e -> {
             if ("toolbar.visible".equals(e.getKey())) {
                 refreshToolbarControl();
@@ -1109,12 +1112,12 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
         String toolbar = (String) action.getValue("toolbar");
         if (toolbar == null) {
             Main.info(tr("Registered toolbar action without name: {0}",
-            action.getClass().getName()));
+                action.getClass().getName()));
         } else {
             Action r = regactions.get(toolbar);
             if (r != null) {
                 Main.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
-                toolbar, r.getClass().getName(), action.getClass().getName()));
+                    toolbar, r.getClass().getName(), action.getClass().getName()));
             }
         }
         if (toolbar != null) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index 8c97d2d..ef80f70 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -53,6 +53,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
@@ -782,10 +783,10 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
         }
 
         private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
-            URL url = null;
+            URL url;
             try {
                 url = new URL(eulaUrl.replaceAll("\\{lang\\}", LanguageInfo.getWikiLanguagePrefix()));
-                JosmEditorPane htmlPane = null;
+                JosmEditorPane htmlPane;
                 try {
                     htmlPane = new JosmEditorPane(url);
                 } catch (IOException e1) {
@@ -903,16 +904,16 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
                 OffsetBookmark info = OffsetBookmark.getBookmarkByIndex(row);
                 switch (column) {
                 case 0:
-                    if (info.projectionCode == null) return "";
-                    return info.projectionCode;
+                    if (info.getProjectionCode() == null) return "";
+                    return info.getProjectionCode();
                 case 1:
-                    return info.layerName;
+                    return info.getImageryName();
                 case 2:
-                    return info.name;
+                    return info.getName();
                 case 3:
-                    return info.dx;
+                    return info.getDisplacement().east();
                 case 4:
-                    return info.dy;
+                    return info.getDisplacement().north();
                 default:
                     throw new ArrayIndexOutOfBoundsException();
                 }
@@ -923,16 +924,18 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
                 OffsetBookmark info = OffsetBookmark.getBookmarkByIndex(row);
                 switch (column) {
                 case 1:
-                    info.layerName = o.toString();
+                    info.setImageryName(o.toString());
                     break;
                 case 2:
-                    info.name = o.toString();
+                    info.setName(o.toString());
                     break;
                 case 3:
-                    info.dx = Double.parseDouble((String) o);
+                    double dx = Double.parseDouble((String) o);
+                    info.setDisplacement(new EastNorth(dx, info.getDisplacement().north()));
                     break;
                 case 4:
-                    info.dy = Double.parseDouble((String) o);
+                    double dy = Double.parseDouble((String) o);
+                    info.setDisplacement(new EastNorth(info.getDisplacement().east(), dy));
                     break;
                 default:
                     throw new ArrayIndexOutOfBoundsException();
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
index 92c237e..00770a0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
@@ -7,6 +7,11 @@ import org.openstreetmap.josm.data.projection.CustomProjection;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * Super class for ProjectionChoice implementations.
+ * <p>
+ * Handles common parameters <code>name</code>, <code>id</code> and <code>cacheDir</code>.
+ */
 public abstract class AbstractProjectionChoice implements ProjectionChoice {
 
     protected String name;
@@ -45,6 +50,12 @@ public abstract class AbstractProjectionChoice implements ProjectionChoice {
         return id;
     }
 
+    /**
+     * Get the cache directory name.
+     * @return the cache directory name (base name)
+     * @deprecated unused - remove in 2017-07
+     */
+    @Deprecated
     public String getCacheDir() {
         return cacheDir;
     }
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
index 5a955a4..6c8aa20 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
@@ -33,6 +33,13 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * ProjectionChoice where a CRS can be defined using various parameters.
+ * <p>
+ * The configuration string mimics the syntax of the PROJ.4 project and should
+ * be mostly compatible.
+ * @see CustomProjection
+ */
 public class CustomProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions {
 
     private String pref;
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
index 1377cb6..bcb470a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
@@ -8,6 +8,11 @@ import java.util.Collections;
 
 import org.openstreetmap.josm.Main;
 
+/**
+ * ProjectionChoice for Gauß-Krüger coordinate system (zones 2-5, EPSG:31466-31469).
+ * <p>
+ * @see <a href="https://de.wikipedia.org/wiki/Gauß-Krüger-Koordinatensystem">Gauß-Krüger</a>
+ */
 public class GaussKruegerProjectionChoice extends ListProjectionChoice {
 
     private static String[] zones = {"2", "3", "4", "5"};
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
index ae16141..a6b861c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
@@ -14,6 +14,11 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * ProjectionChoice for Lambert CC (9 zones, EPSG:3942-3950).
+ * <p>
+ * @see <a href="https://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Lambert_zone_CC">Lambert CC</a>
+ */
 public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
 
     private static String[] lambert9zones = {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
index ae0802e..53f0671 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
@@ -14,6 +14,11 @@ import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * ProjectionChoice for 4 zone Lambert (1920, EPSG:27561-27564).
+ * <p>
+ * @see <a href="https://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Lambert_zone">Lambert zone</a>
+ */
 public class LambertProjectionChoice extends ListProjectionChoice {
 
     private static final String[] lambert4zones = {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
index a3be72d..abe9122 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
@@ -8,6 +8,12 @@ import java.util.Collections;
 
 import org.openstreetmap.josm.tools.Utils;
 
+/**
+ * ProjectionChoice for PUWG 1992 (EPSG:2180) and PUWG 2000 for Poland (Zone 5-8, EPSG:2176-2179).
+ * <p>
+ * @see <a href="https://pl.wikipedia.org/wiki/Uk%C5%82ad_wsp%C3%B3%C5%82rz%C4%99dnych_1992">PUWG 1992</a>
+ * @see <a href="https://pl.wikipedia.org/wiki/Uk%C5%82ad_wsp%C3%B3%C5%82rz%C4%99dnych_2000">PUWG 2000</a>
+ */
 public class PuwgProjectionChoice extends ListProjectionChoice {
 
     private static final String[] CODES = {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
index 1355cc6..4d65520 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
@@ -12,6 +12,12 @@ import javax.swing.JPanel;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * ProjectionChoice for Swiss grid, CH1903 / LV03 military coordinates (EPSG:21781).
+ * <p>
+ * This is the old system and <b>not</b> CH1903+ from 1995.
+ * @see <a href="https://en.wikipedia.org/wiki/Swiss_coordinate_system">swiss grid</a>
+ */
 public class SwissGridProjectionChoice extends SingleProjectionChoice {
 
     /**
@@ -24,7 +30,7 @@ public class SwissGridProjectionChoice extends SingleProjectionChoice {
     @Override
     public JPanel getPreferencePanel(ActionListener listener) {
         JPanel p = new JPanel(new GridBagLayout());
-        p.add(new HtmlPanel(tr("<i>CH1903 / LV03 (without local corrections)</i>")), GBC.eol().fill(GBC.HORIZONTAL));
+        p.add(new HtmlPanel(tr("<i>CH1903 / LV03</i>")), GBC.eol().fill(GBC.HORIZONTAL));
         p.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
         return p;
     }
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
index e3a07ee..68a337c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
@@ -8,6 +8,11 @@ import java.util.Collections;
 
 import org.openstreetmap.josm.Main;
 
+/**
+ * ProjectionChoice for various French overseas territories (EPSG:2969,2970,2972,2973,2975).
+ * <p>
+ * @see <a href="https://fr.wikipedia.org/wiki/Système_de_coordonnées_(cartographie)#Dans_les_d.C3.A9partements_d.27Outre-mer">DOM</a>
+ */
 public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
 
     private static final String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
index 21ea8cf..00c4d84 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
@@ -18,6 +18,11 @@ import javax.swing.JRadioButton;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * ProjectionChoice for UTM.
+ * <p>
+ * @see <a href="https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system">UTM</a>
+ */
 public class UTMProjectionChoice extends ListProjectionChoice {
 
     /** Earth emispheres **/
diff --git a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
index e47c331..cf8545e 100644
--- a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
@@ -17,6 +17,11 @@ import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
+/**
+ * A progress monitor used in {@link org.openstreetmap.josm.gui.PleaseWaitRunnable}.
+ * <p>
+ * Progress is displayed in a dialog window ({@link PleaseWaitDialog}).
+ */
 public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
index 4ee5304..3abdc30 100644
--- a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
@@ -4,6 +4,8 @@ package org.openstreetmap.josm.gui.progress;
 import java.awt.Component;
 
 /**
+ * An interface for displaying the progress of a task.
+ * <p>
  * Typical use case is:
  * <pre>
  *   monitor.beginTask()
@@ -20,12 +22,12 @@ import java.awt.Component;
  *
  * {@link #subTask(String)} and {@link #indeterminateSubTask(String)} has nothing to do with logical
  * structure of the work, they just show task title to the user.
- *
+ * <p>
  * If task consists of multiple tasks then {@link #createSubTaskMonitor(int, boolean)} may be used. It
  * will create new ProgressMonitor, then can be passed to the subtask. Subtask doesn't know whether
  * it runs standalone or as a part of other task. Progressbar will be updated so that total progress is
  * shown, not just progress of the subtask
- *
+ * <p>
  * All ProgressMonitor implementations should be thread safe.
  *
  */
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
index 0ba1707..1f14351 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
@@ -28,11 +28,7 @@ import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
-import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
-import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -202,38 +198,6 @@ public class AutoCompletionManager implements DataSetListener {
     }
 
     /**
-     * Initialize the cache for presets. This is done only once.
-     * @param presets Tagging presets to cache
-     */
-    public static void cachePresets(Collection<TaggingPreset> presets) {
-        for (final TaggingPreset p : presets) {
-            for (TaggingPresetItem item : p.data) {
-                cachePresetItem(p, item);
-            }
-        }
-    }
-
-    protected static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) {
-        if (item instanceof KeyedItem) {
-            KeyedItem ki = (KeyedItem) item;
-            if (ki.key != null && ki.getValues() != null) {
-                PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
-            }
-        } else if (item instanceof Roles) {
-            Roles r = (Roles) item;
-            for (Role i : r.roles) {
-                if (i.key != null) {
-                    PRESET_ROLE_CACHE.add(i.key);
-                }
-            }
-        } else if (item instanceof CheckGroup) {
-            for (KeyedItem check : ((CheckGroup) item).checks) {
-                cachePresetItem(p, check);
-            }
-        }
-    }
-
-    /**
      * Remembers user input for the given key/value.
      * @param key Tag key
      * @param value Tag value
@@ -254,10 +218,6 @@ public class AutoCompletionManager implements DataSetListener {
         return new ArrayList<>(getTagCache().keySet());
     }
 
-    protected List<String> getPresetKeys() {
-        return new ArrayList<>(PRESET_TAG_CACHE.keySet());
-    }
-
     protected Collection<String> getUserInputKeys() {
         List<String> keys = new ArrayList<>();
         for (UserInputTag tag : USER_INPUT_TAG_CACHE) {
@@ -280,10 +240,6 @@ public class AutoCompletionManager implements DataSetListener {
         return new ArrayList<>(getTagCache().getValues(key));
     }
 
-    protected static List<String> getPresetValues(String key) {
-        return new ArrayList<>(PRESET_TAG_CACHE.getValues(key));
-    }
-
     protected static Collection<String> getUserInputValues(String key) {
         List<String> values = new ArrayList<>();
         for (UserInputTag tag : USER_INPUT_TAG_CACHE) {
@@ -311,7 +267,7 @@ public class AutoCompletionManager implements DataSetListener {
      * @param list the list to populate
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
-        list.add(PRESET_ROLE_CACHE, AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(TaggingPresets.getPresetRoles(), AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET);
     }
 
@@ -346,7 +302,7 @@ public class AutoCompletionManager implements DataSetListener {
      * @param list the list to populate
      */
     public void populateWithKeys(AutoCompletionList list) {
-        list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(TaggingPresets.getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD));
         list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET);
         list.addUserInput(getUserInputKeys());
@@ -372,7 +328,7 @@ public class AutoCompletionManager implements DataSetListener {
      */
     public void populateWithTagValues(AutoCompletionList list, List<String> keys) {
         for (String key : keys) {
-            list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
+            list.add(TaggingPresets.getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
             list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET);
             list.addUserInput(getUserInputValues(key));
         }
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
index 0b9b117..8e16bfb 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
@@ -32,6 +32,7 @@ import javax.swing.JToggleButton;
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AdaptableAction;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -72,7 +73,7 @@ import org.xml.sax.SAXException;
  * It is also able to construct dialogs out of preset definitions.
  * @since 294
  */
-public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, Predicate<OsmPrimitive> {
+public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, AdaptableAction, Predicate<OsmPrimitive> {
 
     public static final int DIALOG_ANSWER_APPLY = 1;
     public static final int DIALOG_ANSWER_NEW_RELATION = 2;
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
index c87db5e..d2f4400 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
@@ -3,8 +3,11 @@ package org.openstreetmap.josm.gui.tagging.presets;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -13,7 +16,11 @@ import javax.swing.JSeparator;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MenuScroller;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
+import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
+import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -25,6 +32,11 @@ public final class TaggingPresets {
     /** The collection of tagging presets */
     private static final Collection<TaggingPreset> taggingPresets = new ArrayList<>();
 
+    /** cache for key/value pairs found in the preset */
+    private static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
+    /** cache for roles found in the preset */
+    private static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
+
     /** The collection of listeners */
     private static final Collection<TaggingPresetListener> listeners = new ArrayList<>();
 
@@ -38,6 +50,7 @@ public final class TaggingPresets {
     public static void readFromPreferences() {
         taggingPresets.clear();
         taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false));
+        cachePresets(taggingPresets);
     }
 
     /**
@@ -53,7 +66,6 @@ public final class TaggingPresets {
         if (taggingPresets.isEmpty()) {
             Main.main.menu.presetsMenu.setVisible(false);
         } else {
-            AutoCompletionManager.cachePresets(taggingPresets);
             Map<TaggingPresetMenu, JMenu> submenus = new HashMap<>();
             for (final TaggingPreset p : taggingPresets) {
                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
@@ -87,11 +99,71 @@ public final class TaggingPresets {
     }
 
     /**
+     * Initialize the cache for presets. This is done only once.
+     * @param presets Tagging presets to cache
+     */
+    public static void cachePresets(Collection<TaggingPreset> presets) {
+        for (final TaggingPreset p : presets) {
+            for (TaggingPresetItem item : p.data) {
+                cachePresetItem(p, item);
+            }
+        }
+    }
+
+    private static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) {
+        if (item instanceof KeyedItem) {
+            KeyedItem ki = (KeyedItem) item;
+            if (ki.key != null && ki.getValues() != null) {
+                PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
+            }
+        } else if (item instanceof Roles) {
+            Roles r = (Roles) item;
+            for (Role i : r.roles) {
+                if (i.key != null) {
+                    PRESET_ROLE_CACHE.add(i.key);
+                }
+            }
+        } else if (item instanceof CheckGroup) {
+            for (KeyedItem check : ((CheckGroup) item).checks) {
+                cachePresetItem(p, check);
+            }
+        }
+    }
+
+    /**
      * Replies a new collection containing all tagging presets.
      * @return a new collection containing all tagging presets. Empty if presets are not initialized (never null)
      */
     public static Collection<TaggingPreset> getTaggingPresets() {
-        return new ArrayList<>(taggingPresets);
+        return Collections.unmodifiableCollection(taggingPresets);
+    }
+
+    /**
+     * Replies a set of all roles in the tagging presets.
+     * @return a set of all roles in the tagging presets.
+     */
+    public static Set<String> getPresetRoles() {
+        return Collections.unmodifiableSet(PRESET_ROLE_CACHE);
+    }
+
+    /**
+     * Replies a set of all keys in the tagging presets.
+     * @return a set of all keys in the tagging presets.
+     */
+    public static Set<String> getPresetKeys() {
+        return Collections.unmodifiableSet(PRESET_TAG_CACHE.keySet());
+    }
+
+    /**
+     * Return set of values for a key in the tagging presets
+     * @param key the key
+     * @return set of values for a key in the tagging presets or null if none is found
+     */
+    public static Set<String> getPresetValues(String key) {
+        Set<String> values = PRESET_TAG_CACHE.get(key);
+        if (values != null)
+            return Collections.unmodifiableSet(values);
+        return null;
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java
index 718f906..9b9618a 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java
@@ -22,9 +22,9 @@ public class Check extends KeyedItem {
     /** The localized version of {@link #text}. */
     public String locale_text; // NOSONAR
     /** the value to set when checked (default is "yes") */
-    public String value_on = OsmUtils.trueval; // NOSONAR
+    public String value_on = OsmUtils.TRUE_VALUE; // NOSONAR
     /** the value to set when unchecked (default is "no") */
-    public String value_off = OsmUtils.falseval; // NOSONAR
+    public String value_off = OsmUtils.FALSE_VALUE; // NOSONAR
     /** whether the off value is disabled in the dialog, i.e., only unset or yes are provided */
     public boolean disable_off; // NOSONAR
     /** "on" or "off" or unset (default is unset) */
diff --git a/src/org/openstreetmap/josm/gui/util/RotationAngle.java b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
index 01b303b..501059a 100644
--- a/src/org/openstreetmap/josm/gui/util/RotationAngle.java
+++ b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
@@ -152,25 +152,25 @@ public interface RotationAngle {
                 return 0; // 0 degree => 0 radian
             case "ne":
             case "northeast":
-                return Math.toRadians(45);
+                return Utils.toRadians(45);
             case "e":
             case "east":
-                return Math.toRadians(90);
+                return Utils.toRadians(90);
             case "se":
             case "southeast":
-                return Math.toRadians(135);
+                return Utils.toRadians(135);
             case "s":
             case "south":
                 return Math.PI; // 180 degree
             case "sw":
             case "southwest":
-                return Math.toRadians(225);
+                return Utils.toRadians(225);
             case "w":
             case "west":
-                return Math.toRadians(270);
+                return Utils.toRadians(270);
             case "nw":
             case "northwest":
-                return Math.toRadians(315);
+                return Utils.toRadians(315);
             default:
                 throw new IllegalArgumentException("Unexpected cardinal direction " + cardinal);
         }
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java b/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
index b106cd4..45607bd 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
@@ -66,8 +66,7 @@ public class JosmImageView extends ImageView {
                 }
                 setPropertiesFromAttributes();
             }
-        } catch (IllegalArgumentException | IllegalAccessException |
-                InvocationTargetException | NoSuchMethodException | SecurityException e) {
+        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
            Main.error(e);
        }
     }
diff --git a/src/org/openstreetmap/josm/io/AbstractReader.java b/src/org/openstreetmap/josm/io/AbstractReader.java
index 7cd6dd5..0c7c815 100644
--- a/src/org/openstreetmap/josm/io/AbstractReader.java
+++ b/src/org/openstreetmap/josm/io/AbstractReader.java
@@ -193,8 +193,8 @@ public abstract class AbstractReader {
     }
 
     protected final void prepareDataSet() throws IllegalDataException {
+        ds.beginUpdate();
         try {
-            ds.beginUpdate();
             processNodesAfterParsing();
             processWaysAfterParsing();
             processRelationsAfterParsing();
diff --git a/src/org/openstreetmap/josm/io/Capabilities.java b/src/org/openstreetmap/josm/io/Capabilities.java
index 0386f77..040a31a 100644
--- a/src/org/openstreetmap/josm/io/Capabilities.java
+++ b/src/org/openstreetmap/josm/io/Capabilities.java
@@ -152,8 +152,11 @@ public class Capabilities {
      * @return {@code true} is version is between the minimum supported version and the maximum one, {@code false} otherwise
      */
     public boolean supportsVersion(String version) {
-        return get("version", "minimum").compareTo(version) <= 0
-            && get("version", "maximum").compareTo(version) >= 0;
+        String min = get("version", "minimum");
+        String max = get("version", "maximum");
+        return min != null && max != null
+            && min.compareTo(version) <= 0
+            && max.compareTo(version) >= 0;
     }
 
     private static void warnIllegalValue(String attr, String elem, Object val) {
diff --git a/src/org/openstreetmap/josm/io/CertificateAmendment.java b/src/org/openstreetmap/josm/io/CertificateAmendment.java
index 1454421..7b4ba07 100644
--- a/src/org/openstreetmap/josm/io/CertificateAmendment.java
+++ b/src/org/openstreetmap/josm/io/CertificateAmendment.java
@@ -48,10 +48,12 @@ public final class CertificateAmendment {
      */
     public static class CertAmend {
         private final String id;
+        private final String filename;
         private final String sha256;
 
-        CertAmend(String path, String sha256) {
-            this.id = path;
+        CertAmend(String id, String filename, String sha256) {
+            this.id = id;
+            this.filename = filename;
             this.sha256 = sha256;
         }
 
@@ -64,6 +66,15 @@ public final class CertificateAmendment {
         }
 
         /**
+         * Returns the certificate filename.
+         * @return filename for both JOSM embedded certificate and platform certificate
+         * @since 12241
+         */
+        public final String getFilename() {
+            return filename;
+        }
+
+        /**
          * Returns the SHA-256 hash.
          * @return the SHA-256 hash, in hexadecimal
          */
@@ -76,7 +87,7 @@ public final class CertificateAmendment {
      * Certificates embedded in JOSM
      */
     private static final CertAmend[] CERT_AMEND = {
-        new CertAmend("resource://data/security/DST_Root_CA_X3.pem",
+        new CertAmend("resource://data/security/DST_Root_CA_X3.pem", "DST_Root_CA_X3.pem",
                 "0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739")
     };
 
@@ -85,9 +96,9 @@ public final class CertificateAmendment {
      * Identifiers must match Windows keystore aliases for efficient search.
      */
     private static final CertAmend[] PLATFORM_CERT_AMEND = {
-        new CertAmend("Staat der Nederlanden Root CA - G2",
+        new CertAmend("Staat der Nederlanden Root CA - G2", "Staat_der_Nederlanden_Root_CA_-_G2.crt",
                 "668c83947da63b724bece1743c31a0e6aed0db8ec5b31be377bb784f91b6716f"),
-        new CertAmend("Government of Netherlands G3",
+        new CertAmend("Government of Netherlands G3", "Staat_der_Nederlanden_Root_CA_-_G3.crt",
                 "3c4fb0b95ab8b30032f432b86f535fe172c185d0fd39865837cf36187fa6f428")
     };
 
diff --git a/src/org/openstreetmap/josm/io/FileImporter.java b/src/org/openstreetmap/josm/io/FileImporter.java
index 706db98..9dc8dfa 100644
--- a/src/org/openstreetmap/josm/io/FileImporter.java
+++ b/src/org/openstreetmap/josm/io/FileImporter.java
@@ -16,6 +16,7 @@ import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
 /**
  * Abstract file importer.
@@ -101,6 +102,9 @@ public abstract class FileImporter implements Comparable<FileImporter> {
         } catch (IOException e) {
             displayError(f, e);
             return false;
+        } catch (RuntimeException | LinkageError e) { // NOPMD
+            BugReportExceptionHandler.handleException(e);
+            return false;
         }
     }
 
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
index a5b6b6b..c5b44cc 100644
--- a/src/org/openstreetmap/josm/io/GeoJSONWriter.java
+++ b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
@@ -210,7 +210,7 @@ public class GeoJSONWriter {
     protected void appendLayerFeatures(DataSet ds, JsonObjectBuilder object) {
         JsonArrayBuilder array = Json.createArrayBuilder();
         if (ds != null) {
-            ds.allPrimitives().forEach(p -> appendPrimitive(p, array));
+            ds.allNonDeletedPrimitives().forEach(p -> appendPrimitive(p, array));
         }
         object.add("features", array);
     }
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index 3a8f8d3..94b5527 100644
--- a/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -465,7 +465,7 @@ public class GpxReader implements GpxConstants {
                 case "trk":
                     currentState = states.pop();
                     convertUrlToLink(currentTrackAttr);
-                    data.tracks.add(new ImmutableGpxTrack(currentTrack, currentTrackAttr));
+                    data.addTrack(new ImmutableGpxTrack(currentTrack, currentTrackAttr));
                     break;
                 case "name":
                 case "cmt":
@@ -496,7 +496,7 @@ public class GpxReader implements GpxConstants {
                 case "rte":
                     currentState = states.pop();
                     convertUrlToLink(currentRoute.attr);
-                    data.routes.add(currentRoute);
+                    data.addRoute(currentRoute);
                     break;
                 default: // Do nothing
                 }
diff --git a/src/org/openstreetmap/josm/io/GpxWriter.java b/src/org/openstreetmap/josm/io/GpxWriter.java
index 0da1cbd..2c31727 100644
--- a/src/org/openstreetmap/josm/io/GpxWriter.java
+++ b/src/org/openstreetmap/josm/io/GpxWriter.java
@@ -185,13 +185,13 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
     }
 
     private void writeWayPoints() {
-        for (WayPoint pnt : data.waypoints) {
+        for (WayPoint pnt : data.getWaypoints()) {
             wayPoint(pnt, WAY_POINT);
         }
     }
 
     private void writeRoutes() {
-        for (GpxRoute rte : data.routes) {
+        for (GpxRoute rte : data.getRoutes()) {
             openln("rte");
             writeAttr(rte, RTE_TRK_KEYS);
             for (WayPoint pnt : rte.routePoints) {
@@ -202,7 +202,7 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
     }
 
     private void writeTracks() {
-        for (GpxTrack trk : data.tracks) {
+        for (GpxTrack trk : data.getTracks()) {
             openln("trk");
             writeAttr(trk, RTE_TRK_KEYS);
             for (GpxTrackSegment seg : trk.getSegments()) {
diff --git a/src/org/openstreetmap/josm/io/NmeaReader.java b/src/org/openstreetmap/josm/io/NmeaReader.java
index 6ed05f1..13a6b21 100644
--- a/src/org/openstreetmap/josm/io/NmeaReader.java
+++ b/src/org/openstreetmap/josm/io/NmeaReader.java
@@ -339,17 +339,17 @@ public class NmeaReader {
             } else if ("$GPGSA".equals(e[0]) || "$GNGSA".equals(e[0])) {
                 // vdop
                 accu = e[GPGSA.VDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_VDOP, Float.valueOf(accu));
                 }
                 // hdop
                 accu = e[GPGSA.HDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_HDOP, Float.valueOf(accu));
                 }
                 // pdop
                 accu = e[GPGSA.PDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_PDOP, Float.valueOf(accu));
                 }
             } else if ("$GPRMC".equals(e[0]) || "$GNRMC".equals(e[0])) {
diff --git a/src/org/openstreetmap/josm/io/OsmReader.java b/src/org/openstreetmap/josm/io/OsmReader.java
index 355eabd..c830d67 100644
--- a/src/org/openstreetmap/josm/io/OsmReader.java
+++ b/src/org/openstreetmap/josm/io/OsmReader.java
@@ -206,7 +206,7 @@ public class OsmReader extends AbstractReader {
             ds.addDataSource(src);
         } else {
             throwException(tr("Missing mandatory attributes on element ''bounds''. " +
-                    "Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
+                    "Got minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''.",
                     minlon, minlat, maxlon, maxlat, origin
             ));
         }
@@ -217,10 +217,20 @@ public class OsmReader extends AbstractReader {
         NodeData nd = new NodeData();
         String lat = parser.getAttributeValue(null, "lat");
         String lon = parser.getAttributeValue(null, "lon");
+        LatLon ll = null;
         if (lat != null && lon != null) {
-            nd.setCoor(new LatLon(Double.parseDouble(lat), Double.parseDouble(lon)));
+            try {
+                ll = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
+                nd.setCoor(ll);
+            } catch (NumberFormatException e) {
+                Main.trace(e);
+            }
         }
         readCommon(nd);
+        if (lat != null && lon != null && (ll == null || !ll.isValid())) {
+            throwException(tr("Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got ''{1}'', ''{2}''.",
+                    Long.toString(nd.getId()), lat, lon));
+        }
         Node n = new Node(nd.getId(), nd.getVersion());
         n.setVisible(nd.isVisible());
         n.load(nd);
diff --git a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
index 5ce0b13..b7e7d45 100644
--- a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
+++ b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
@@ -30,6 +30,11 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+/**
+ * Reader to parse the list of available imagery servers from an XML definition file.
+ * <p>
+ * The format is specified in the <a href="https://josm.openstreetmap.de/wiki/Maps">JOSM wiki</a>.
+ */
 public class ImageryReader implements Closeable {
 
     private final String source;
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java b/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
deleted file mode 100644
index f8b26cb..0000000
--- a/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openstreetmap.josm.io.remotecontrol;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import sun.security.util.DerOutputStream;
-import sun.security.x509.GeneralNameInterface;
-
-/**
- * This class implements the DNSName as required by the GeneralNames
- * ASN.1 object.
- * <p>
- * [RFC2459] When the subjectAltName extension contains a domain name service
- * label, the domain name MUST be stored in the dNSName (an IA5String).
- * The name MUST be in the "preferred name syntax," as specified by RFC
- * 1034 [RFC 1034]. Note that while upper and lower case letters are
- * allowed in domain names, no signifigance is attached to the case.  In
- * addition, while the string " " is a legal domain name, subjectAltName
- * extensions with a dNSName " " are not permitted.  Finally, the use of
- * the DNS representation for Internet mail addresses (wpolk.nist.gov
- * instead of wpolk at nist.gov) is not permitted; such identities are to
- * be encoded as rfc822Name.
- *
- * This class has been copied from OpenJDK7u repository and modified
- * in order to fix Java bug 8016345:
- * https://bugs.openjdk.java.net/browse/JDK-8016345
- *
- * It can be deleted after a migration to a Java release fixing this bug.
- * <p>
- * @author Amit Kapoor
- * @author Hemma Prafullchandra
- * @author JOSM developers
- * @since 7347
- */
-public final class DNSName implements GeneralNameInterface {
-    private final String name;
-
-    private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-    private static final String digitsAndHyphen = "0123456789-";
-    private static final String alphaDigitsAndHyphen = alpha + digitsAndHyphen;
-
-    /**
-     * Create the DNSName object with the specified name.
-     *
-     * @param name the DNSName.
-     * @throws IOException if the name is not a valid DNSName subjectAltName
-     */
-    public DNSName(String name) throws IOException {
-        if (name == null || name.isEmpty())
-            throw new IOException("DNS name must not be null");
-        if (name.indexOf(' ') != -1)
-            throw new IOException("DNS names or NameConstraints with blank components are not permitted");
-        if (name.charAt(0) == '.' || name.charAt(name.length() -1) == '.')
-            throw new IOException("DNS names or NameConstraints may not begin or end with a .");
-        //Name will consist of label components separated by "."
-        //startIndex is the index of the first character of a component
-        //endIndex is the index of the last character of a component plus 1
-        for (int endIndex, startIndex = 0; startIndex < name.length(); startIndex = endIndex+1) {
-            endIndex = name.indexOf('.', startIndex);
-            if (endIndex < 0) {
-                endIndex = name.length();
-            }
-            if ((endIndex-startIndex) < 1)
-                throw new IOException("DNSName SubjectAltNames with empty components are not permitted");
-
-            //nonStartIndex: index for characters in the component beyond the first one
-            for (int nonStartIndex = startIndex+1; nonStartIndex < endIndex; nonStartIndex++) {
-                char x = name.charAt(nonStartIndex);
-                if ((alphaDigitsAndHyphen).indexOf(x) < 0)
-                    throw new IOException("DNSName components must consist of letters, digits, and hyphens");
-            }
-        }
-        this.name = name;
-    }
-
-    /**
-     * Return the type of the GeneralName.
-     * @return the type of the GeneralName
-     */
-    @Override
-    public int getType() {
-        return GeneralNameInterface.NAME_DNS;
-    }
-
-    /**
-     * Return the actual name value of the GeneralName.
-     * @return the actual name value of the GeneralName
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Encode the DNS name into the DerOutputStream.
-     *
-     * @param out the DER stream to encode the DNSName to.
-     * @throws IOException on encoding errors.
-     */
-    @Override
-    public void encode(DerOutputStream out) throws IOException {
-        out.putIA5String(name);
-    }
-
-    /**
-     * Convert the name into user readable string.
-     */
-    @Override
-    public String toString() {
-        return "DNSName: " + name;
-    }
-
-    /**
-     * Compares this name with another, for equality.
-     *
-     * @return true iff the names are equivalent
-     * according to RFC2459.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-
-        if (!(obj instanceof DNSName))
-            return false;
-
-        DNSName other = (DNSName) obj;
-
-        // RFC2459 mandates that these names are
-        // not case-sensitive
-        return name.equalsIgnoreCase(other.name);
-    }
-
-    /**
-     * Returns the hash code value for this object.
-     *
-     * @return a hash code value for this object.
-     */
-    @Override
-    public int hashCode() {
-        return name.toUpperCase(Locale.ENGLISH).hashCode();
-    }
-
-    /**
-     * Return type of constraint inputName places on this name:<ul>
-     *   <li>NAME_DIFF_TYPE = -1: input name is different type from name (i.e. does not constrain).
-     *   <li>NAME_MATCH = 0: input name matches name.
-     *   <li>NAME_NARROWS = 1: input name narrows name (is lower in the naming subtree)
-     *   <li>NAME_WIDENS = 2: input name widens name (is higher in the naming subtree)
-     *   <li>NAME_SAME_TYPE = 3: input name does not match or narrow name, but is same type.
-     * </ul>.  These results are used in checking NameConstraints during
-     * certification path verification.
-     * <p>
-     * RFC2459: DNS name restrictions are expressed as foo.bar.com. Any subdomain
-     * satisfies the name constraint. For example, www.foo.bar.com would
-     * satisfy the constraint but bigfoo.bar.com would not.
-     * <p>
-     * draft-ietf-pkix-new-part1-00.txt:  DNS name restrictions are expressed as foo.bar.com.
-     * Any DNS name that
-     * can be constructed by simply adding to the left hand side of the name
-     * satisfies the name constraint. For example, www.foo.bar.com would
-     * satisfy the constraint but foo1.bar.com would not.
-     * <p>
-     * RFC1034: By convention, domain names can be stored with arbitrary case, but
-     * domain name comparisons for all present domain functions are done in a
-     * case-insensitive manner, assuming an ASCII character set, and a high
-     * order zero bit.
-     * <p>
-     * @param inputName to be checked for being constrained
-     * @return constraint type above
-     * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
-     *          not supported for this name type.
-     */
-    @Override
-    public int constrains(GeneralNameInterface inputName) {
-        int constraintType;
-        if (inputName == null)
-            constraintType = NAME_DIFF_TYPE;
-        else if (inputName.getType() != NAME_DNS)
-            constraintType = NAME_DIFF_TYPE;
-        else {
-            if (!(inputName instanceof DNSName)) {
-                throw new IllegalArgumentException("inputName: " + inputName);
-            }
-            String inName =
-                (((DNSName) inputName).getName()).toLowerCase(Locale.ENGLISH);
-            String thisName = name.toLowerCase(Locale.ENGLISH);
-            if (inName.equals(thisName))
-                constraintType = NAME_MATCH;
-            else if (thisName.endsWith(inName)) {
-                int inNdx = thisName.lastIndexOf(inName);
-                if (thisName.charAt(inNdx-1) == '.')
-                    constraintType = NAME_WIDENS;
-                else
-                    constraintType = NAME_SAME_TYPE;
-            } else if (inName.endsWith(thisName)) {
-                int ndx = inName.lastIndexOf(thisName);
-                if (inName.charAt(ndx-1) == '.')
-                    constraintType = NAME_NARROWS;
-                else
-                    constraintType = NAME_SAME_TYPE;
-            } else {
-                constraintType = NAME_SAME_TYPE;
-            }
-        }
-        return constraintType;
-    }
-
-    /**
-     * Return subtree depth of this name for purposes of determining
-     * NameConstraints minimum and maximum bounds and for calculating
-     * path lengths in name subtrees.
-     *
-     * @return distance of name from root
-     * @throws UnsupportedOperationException if not supported for this name type
-     */
-    @Override
-    public int subtreeDepth() {
-        String subtree = name;
-        int i = 1;
-
-        /* count dots */
-        for (; subtree.lastIndexOf('.') >= 0; i++) {
-            subtree = subtree.substring(0, subtree.lastIndexOf('.'));
-        }
-
-        return i;
-    }
-}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java b/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java
new file mode 100644
index 0000000..cc765fc
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openstreetmap.josm.io.remotecontrol;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * This class implements the DNSName as required by the GeneralNames
+ * ASN.1 object.
+ * <p>
+ * [RFC2459] When the subjectAltName extension contains a domain name service
+ * label, the domain name MUST be stored in the dNSName (an IA5String).
+ * The name MUST be in the "preferred name syntax," as specified by RFC
+ * 1034 [RFC 1034]. Note that while upper and lower case letters are
+ * allowed in domain names, no signifigance is attached to the case.  In
+ * addition, while the string " " is a legal domain name, subjectAltName
+ * extensions with a dNSName " " are not permitted.  Finally, the use of
+ * the DNS representation for Internet mail addresses (wpolk.nist.gov
+ * instead of wpolk at nist.gov) is not permitted; such identities are to
+ * be encoded as rfc822Name.
+ *
+ * This class has been copied from OpenJDK8u repository and modified
+ * in order to fix Java bug 8016345:
+ * https://bugs.openjdk.java.net/browse/JDK-8016345
+ *
+ * It can be deleted after a migration to a Java release fixing this bug:
+ * https://bugs.openjdk.java.net/browse/JDK-8054380
+ * <p>
+ * @author Amit Kapoor
+ * @author Hemma Prafullchandra
+ * @author JOSM developers
+ * @since 7347
+ */
+public final class DNSNameFix extends sun.security.x509.DNSName {
+
+    private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    private static final String digitsAndHyphen = "0123456789-";
+    private static final String alphaDigitsAndHyphen = alpha + digitsAndHyphen;
+
+    /**
+     * Create the DNSName object with the specified name.
+     *
+     * @param name the DNSName.
+     * @throws IOException if the name is not a valid DNSName subjectAltName
+     */
+    public DNSNameFix(String name) throws IOException {
+        super("fake");
+        if (name == null || name.isEmpty())
+            throw new IOException("DNS name must not be null");
+        if (name.indexOf(' ') != -1)
+            throw new IOException("DNS names or NameConstraints with blank components are not permitted");
+        if (name.charAt(0) == '.' || name.charAt(name.length() -1) == '.')
+            throw new IOException("DNS names or NameConstraints may not begin or end with a .");
+        //Name will consist of label components separated by "."
+        //startIndex is the index of the first character of a component
+        //endIndex is the index of the last character of a component plus 1
+        for (int endIndex, startIndex = 0; startIndex < name.length(); startIndex = endIndex+1) {
+            endIndex = name.indexOf('.', startIndex);
+            if (endIndex < 0) {
+                endIndex = name.length();
+            }
+            if ((endIndex-startIndex) < 1)
+                throw new IOException("DNSName SubjectAltNames with empty components are not permitted");
+
+            //nonStartIndex: index for characters in the component beyond the first one
+            for (int nonStartIndex = startIndex+1; nonStartIndex < endIndex; nonStartIndex++) {
+                char x = name.charAt(nonStartIndex);
+                if ((alphaDigitsAndHyphen).indexOf(x) < 0)
+                    throw new IOException("DNSName components must consist of letters, digits, and hyphens");
+            }
+        }
+        try {
+            Field fName = getClass().getSuperclass().getDeclaredField("name");
+            Utils.setObjectsAccessible(fName);
+            fName.set(this, name);
+        } catch (ReflectiveOperationException | SecurityException e) {
+            throw new IOException(e);
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 27a6fe3..89e44b8 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -118,7 +118,7 @@ public class RemoteControlHttpsServer extends Thread {
         GeneralNameInterface gn;
         switch (t.toLowerCase(Locale.ENGLISH)) {
             case "uri": gn = new URIName(v); break;
-            case "dns": gn = new DNSName(v); break;
+            case "dns": gn = new DNSNameFix(v); break;
             case "ip": gn = new IPAddressName(v); break;
             default: gn = new OIDName(v);
         }
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
index 31988a7..5d83041 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
@@ -13,6 +13,7 @@ import javax.swing.SwingConstants;
 
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
@@ -81,14 +82,26 @@ public class ImagerySessionExporter extends AbstractSessionExporter<ImageryLayer
         ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo());
         Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
         if (layer instanceof AbstractTileSourceLayer) {
-            AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
-            tsLayer.getDisplaySettings().storeTo(data);
+            ((AbstractTileSourceLayer<?>) layer).getDisplaySettings().storeTo(data);
         }
-        for (Map.Entry<String, String> entry : data.entrySet()) {
+        addAttributes(layerElem, data, support);
+        if (layer instanceof AbstractTileSourceLayer) {
+            OffsetBookmark offset = ((AbstractTileSourceLayer<?>) layer).getDisplaySettings().getOffsetBookmark();
+            if (offset != null) {
+                Map<String, String> offsetProps = offset.toPropertiesMap();
+                Element offsetEl = support.createElement("offset");
+                layerElem.appendChild(offsetEl);
+                addAttributes(offsetEl, offsetProps, support);
+            }
+        }
+        return layerElem;
+    }
+
+    private static void addAttributes(Element element, Map<String, String> props, ExportSupport support) {
+        for (Map.Entry<String, String> entry : props.entrySet()) {
             Element attrElem = support.createElement(entry.getKey());
-            layerElem.appendChild(attrElem);
+            element.appendChild(attrElem);
             attrElem.appendChild(support.createTextNode(entry.getValue()));
         }
-        return layerElem;
     }
 }
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
index df5f135..bbca54d 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
@@ -10,6 +10,7 @@ import java.util.Map;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -35,24 +36,38 @@ public class ImagerySessionImporter implements SessionLayerImporter {
         if (!"0.1".equals(version)) {
             throw new IllegalDataException(tr("Version ''{0}'' of meta data for imagery layer is not supported. Expected: 0.1", version));
         }
-        Map<String, String> attributes = new HashMap<>();
+        Map<String, String> attributes = readProperties(elem);
 
-        NodeList nodes = elem.getChildNodes();
+        ImageryPreferenceEntry prefEntry = Preferences.deserializeStruct(attributes, ImageryPreferenceEntry.class);
+        ImageryInfo info = new ImageryInfo(prefEntry);
+        ImageryLayer layer = ImageryLayer.create(info);
+        if (layer instanceof AbstractTileSourceLayer) {
+            AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
+            tsLayer.getDisplaySettings().loadFrom(attributes);
+            NodeList nodes = elem.getChildNodes();
+            for (int i = 0; i < nodes.getLength(); ++i) {
+                Node node = nodes.item(i);
+                if (node.getNodeType() == Node.ELEMENT_NODE && "offset".equals(node.getLocalName())) {
+                    Map<String, String> offsetAttributes = readProperties((Element) node);
+                    OffsetBookmark offset = OffsetBookmark.fromPropertiesMap(offsetAttributes);
+                    tsLayer.getDisplaySettings().setOffsetBookmark(offset);
+                    break;
+                }
+            }
+        }
+        return layer;
+    }
 
+    private static Map<String, String> readProperties(Element elem) {
+        Map<String, String> attributes = new HashMap<>();
+        NodeList nodes = elem.getChildNodes();
         for (int i = 0; i < nodes.getLength(); ++i) {
             Node node = nodes.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
+            if (node.getNodeType() == Node.ELEMENT_NODE && node.getChildNodes().getLength() <= 1) {
                 Element e = (Element) node;
                 attributes.put(e.getTagName(), e.getTextContent());
             }
         }
-        ImageryPreferenceEntry prefEntry = Preferences.deserializeStruct(attributes, ImageryPreferenceEntry.class);
-        ImageryInfo i = new ImageryInfo(prefEntry);
-        ImageryLayer layer = ImageryLayer.create(i);
-        if (layer instanceof AbstractTileSourceLayer) {
-            AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
-            tsLayer.getDisplaySettings().loadFrom(attributes);
-        }
-        return layer;
+        return attributes;
     }
 }
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index 8e40943..7c63807 100644
--- a/src/org/openstreetmap/josm/plugins/PluginInformation.java
+++ b/src/org/openstreetmap/josm/plugins/PluginInformation.java
@@ -8,7 +8,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -324,7 +323,7 @@ public class PluginInformation {
             Constructor<?> c = klass.getConstructor(PluginInformation.class);
             Object plugin = c.newInstance(this);
             return new PluginProxy(plugin, this);
-        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
             throw new PluginException(name, e);
         }
     }
diff --git a/src/org/openstreetmap/josm/plugins/PluginProxy.java b/src/org/openstreetmap/josm/plugins/PluginProxy.java
index 6064deb..b083024 100644
--- a/src/org/openstreetmap/josm/plugins/PluginProxy.java
+++ b/src/org/openstreetmap/josm/plugins/PluginProxy.java
@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import org.openstreetmap.josm.Main;
@@ -46,7 +45,7 @@ public class PluginProxy extends Plugin {
         } catch (NoSuchMethodException e) {
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
     }
@@ -59,7 +58,7 @@ public class PluginProxy extends Plugin {
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
         return null;
@@ -72,7 +71,7 @@ public class PluginProxy extends Plugin {
         } catch (NoSuchMethodException e) {
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
     }
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index aedf19c..d909e7f 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -21,7 +21,6 @@ import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
@@ -223,7 +222,7 @@ public final class Geometry {
 
         BBox bounds = new BBox(nodes.get(0));
         for (Node n: nodes) {
-            bounds.add(n.getCoor());
+            bounds.add(n);
         }
         return bounds;
     }
@@ -416,7 +415,7 @@ public final class Geometry {
         else if (segmentOnly && offset >= 1)
             return p2;
         else
-            return new EastNorth(p1.getX() + ldx * offset, p1.getY() + ldy * offset);
+            return p1.interpolate(p2, offset);
     }
 
     /**
@@ -512,10 +511,10 @@ public final class Geometry {
         boolean begin = true;
         for (Node n : polygon) {
             if (begin) {
-                path.moveTo(n.getCoor().lon(), n.getCoor().lat());
+                path.moveTo(n.lon(), n.lat());
                 begin = false;
             } else {
-                path.lineTo(n.getCoor().lon(), n.getCoor().lat());
+                path.lineTo(n.lon(), n.lat());
             }
         }
         if (!begin) {
@@ -727,8 +726,8 @@ public final class Geometry {
         double area2 = 0.;
 
         for (int node = 1; node <= /*sic! consider last-first as well*/ nodesCount; node++) {
-            LatLon coorPrev = nodes.get(node - 1).getCoor();
-            LatLon coorCurr = nodes.get(node % nodesCount).getCoor();
+            Node coorPrev = nodes.get(node - 1);
+            Node coorCurr = nodes.get(node % nodesCount);
             area2 += coorPrev.lon() * coorCurr.lat();
             area2 -= coorCurr.lon() * coorPrev.lat();
         }
@@ -987,13 +986,15 @@ public final class Geometry {
         CheckParameterUtil.ensureParameterNotNull(nodes, "nodes");
         double area = 0;
         double perimeter = 0;
+        Projection useProjection = projection == null ? Main.getProjection() : projection;
+
         if (!nodes.isEmpty()) {
             boolean closed = nodes.get(0) == nodes.get(nodes.size() - 1);
             int numSegments = closed ? nodes.size() - 1 : nodes.size();
-            EastNorth p1 = projection == null ? nodes.get(0).getEastNorth() : projection.latlon2eastNorth(nodes.get(0).getCoor());
+            EastNorth p1 = nodes.get(0).getEastNorth(useProjection);
             for (int i = 1; i <= numSegments; i++) {
                 final Node node = nodes.get(i == numSegments ? 0 : i);
-                final EastNorth p2 = projection == null ? node.getEastNorth() : projection.latlon2eastNorth(node.getCoor());
+                final EastNorth p2 = node.getEastNorth(useProjection);
                 if (p1 != null && p2 != null) {
                     area += p1.east() * p2.north() - p2.east() * p1.north();
                     perimeter += p1.distance(p2);
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 24c13c3..d1a6871 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -1316,7 +1316,7 @@ public class ImageProvider {
                     angle = 90.0;
                 }
 
-                double radian = Math.toRadians(angle);
+                double radian = Utils.toRadians(angle);
 
                 new ImageIcon(img); // load completely
                 int iw = img.getWidth(null);
@@ -1345,7 +1345,7 @@ public class ImageProvider {
                 g2d.translate(w / 2, h / 2);
 
                 // rotate the graphics about the center point of the icon
-                g2d.rotate(Math.toRadians(originalAngle));
+                g2d.rotate(Utils.toRadians(originalAngle));
 
                 g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
                 g2d.drawImage(img, -cx, -cy, null);
diff --git a/src/org/openstreetmap/josm/tools/ListenableWeakReference.java b/src/org/openstreetmap/josm/tools/ListenableWeakReference.java
new file mode 100644
index 0000000..0adbeb9
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/ListenableWeakReference.java
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+
+import org.openstreetmap.josm.tools.bugreport.BugReport;
+
+/**
+ * This is a special weak reference that notifies a listener when it is no longer available.
+ *
+ * A special dereferenced-thread is used for this, so make sure your code is thread-safe.
+ * @author Michael Zangl
+ * @since 12181
+ *
+ * @param <T> The weak reference
+ */
+public class ListenableWeakReference<T> extends WeakReference<T> {
+    private static final ReferenceQueue<Object> GLOBAL_QUEUE = new ReferenceQueue<>();
+    private static Thread thread;
+    private Runnable runOnDereference;
+
+    /**
+     * Create a new {@link ListenableWeakReference}
+     * @param referent The object that is referenced
+     */
+    public ListenableWeakReference(T referent) {
+        this(referent, () -> { });
+    }
+
+    /**
+     * Create a new {@link ListenableWeakReference}
+     * @param referent The object that is referenced
+     * @param runOnDereference The runnable to run when the object is no longer referenced.
+     */
+    public ListenableWeakReference(T referent, Runnable runOnDereference) {
+        super(referent, GLOBAL_QUEUE);
+        this.runOnDereference = runOnDereference;
+        ensureQueueStarted();
+    }
+
+    /**
+     * This method is called after the object is dereferenced.
+     */
+    protected void onDereference() {
+        this.runOnDereference.run();
+    }
+
+    private static synchronized void ensureQueueStarted() {
+        if (thread == null) {
+            thread = new Thread(ListenableWeakReference::clean, "Weak reference cleaner");
+            thread.start();
+        }
+    }
+
+    private static void clean() {
+        try {
+            while (true) {
+                Reference<? extends Object> ref = GLOBAL_QUEUE.remove();
+                if (ref instanceof ListenableWeakReference) {
+                    ((ListenableWeakReference<?>) ref).onDereference();
+                }
+            }
+        } catch (InterruptedException e) {
+            BugReport.intercept(e).warn();
+            Thread.currentThread().interrupt();
+        }
+    }
+}
diff --git a/src/org/openstreetmap/josm/tools/ListeningCollection.java b/src/org/openstreetmap/josm/tools/ListeningCollection.java
new file mode 100644
index 0000000..4361a74
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/ListeningCollection.java
@@ -0,0 +1,96 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.util.AbstractCollection;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * This is a proxy of a collection that notifies a listener on every collection change
+ * @author Michael Zangl
+ *
+ * @param <T> The entry type
+ * @since 12267 (extracted from GpxData)
+ * @since 12156
+ */
+public class ListeningCollection<T> extends AbstractCollection<T> {
+    private final List<T> base;
+    private final Runnable runOnModification;
+
+    /**
+     * Constructs a new {@code ListeningCollection}.
+     * @param base base collection
+     * @param runOnModification runnable run at each modification
+     * @since 12269
+     */
+    public ListeningCollection(List<T> base, Runnable runOnModification) {
+        this.base = base;
+        this.runOnModification = runOnModification;
+    }
+
+    @Override
+    public final Iterator<T> iterator() {
+        Iterator<T> it = base.iterator();
+        return new Iterator<T>() {
+            private T object;
+
+            @Override
+            public boolean hasNext() {
+                return it.hasNext();
+            }
+
+            @Override
+            public T next() {
+                object = it.next();
+                return object;
+            }
+
+            @Override
+            public void remove() {
+                if (object != null) {
+                    removed(object);
+                    object = null;
+                }
+                it.remove();
+            }
+        };
+    }
+
+    @Override
+    public final int size() {
+        return base.size();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final boolean remove(Object o) {
+        boolean remove = base.remove(o);
+        if (remove) {
+            removed((T) o);
+        }
+        return remove;
+    }
+
+    @Override
+    public final boolean add(T e) {
+        boolean add = base.add(e);
+        added(e);
+        return add;
+    }
+
+    /**
+     * Called when an object is removed.
+     * @param object the removed object
+     */
+    protected void removed(T object) {
+        runOnModification.run();
+    }
+
+    /**
+     * Called when an object is added.
+     * @param object the added object
+     */
+    protected void added(T object) {
+        runOnModification.run();
+    }
+}
diff --git a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
index 239e335..fcfb27c 100644
--- a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
+++ b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
@@ -46,7 +46,7 @@ public final class OsmUrlToBounds {
         Bounds b = parseShortLink(url);
         if (b != null)
             return b;
-        if (url.contains("#map")) {
+        if (url.contains("#map") || url.contains("/#")) {
             // probably it's a URL following the new scheme?
             return parseHashURLs(url);
         }
@@ -94,11 +94,11 @@ public final class OsmUrlToBounds {
      * @return Bounds if hashurl, {@code null} otherwise
      */
     private static Bounds parseHashURLs(String url) {
-        int startIndex = url.indexOf("#map=");
+        int startIndex = url.indexOf('#');
         if (startIndex == -1) return null;
         int endIndex = url.indexOf('&', startIndex);
         if (endIndex == -1) endIndex = url.length();
-        String coordPart = url.substring(startIndex+5, endIndex);
+        String coordPart = url.substring(startIndex+(url.contains("#map=") ? "#map=".length() : "#".length()), endIndex);
         String[] parts = coordPart.split("/");
         if (parts.length < 3) {
             Main.warn(tr("URL does not contain {0}/{1}/{2}", tr("zoom"), tr("latitude"), tr("longitude")));
diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
index 3f3328f..3b57582 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -1,17 +1,30 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.List;
 
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
  * This interface allows platform (operating system) dependent code
@@ -139,6 +152,15 @@ public interface PlatformHook {
     String getOSDescription();
 
     /**
+     * Returns OS build number.
+     * @return OS build number.
+     * @since 12217
+     */
+    default String getOSBuildNumber() {
+        return "";
+    }
+
+    /**
      * Setup system keystore to add JOSM HTTPS certificate (for remote control).
      * @param entryAlias The entry alias to use
      * @param trustedCert the JOSM certificate for localhost
@@ -171,6 +193,20 @@ public interface PlatformHook {
     }
 
     /**
+     * Executes a native command and returns the first line of standard output.
+     * @param command array containing the command to call and its arguments.
+     * @return first stripped line of standard output
+     * @throws IOException if an I/O error occurs
+     * @since 12217
+     */
+    default String exec(String... command) throws IOException {
+        Process p = Runtime.getRuntime().exec(command);
+        try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
+            return Utils.strip(input.readLine());
+        }
+    }
+
+    /**
      * Returns the platform-dependent default cache directory.
      * @return the platform-dependent default cache directory
      * @since 7829
@@ -197,4 +233,70 @@ public interface PlatformHook {
      * @since 11642
      */
     List<File> getDefaultProj4NadshiftDirectories();
+
+    /**
+     * Determines if the JVM is OpenJDK-based.
+     * @return {@code true} if {@code java.home} contains "openjdk", {@code false} otherwise
+     * @since 12219
+     */
+    default boolean isOpenJDK() {
+        String javaHome = System.getProperty("java.home");
+        return javaHome != null && javaHome.contains("openjdk");
+    }
+
+    /**
+     * Asks user to update its version of Java.
+     * @param updVersion target update version
+     * @param url download URL
+     * @param major true for a migration towards a major version of Java (8:9), false otherwise
+     * @param eolDate the EOL/expiration date
+     * @since 12219
+     */
+    default void askUpdateJava(String updVersion, String url, String eolDate, boolean major) {
+        ExtendedDialog ed = new ExtendedDialog(
+                Main.parent,
+                tr("Outdated Java version"),
+                new String[]{tr("OK"), tr("Update Java"), tr("Cancel")});
+        // Check if the dialog has not already been permanently hidden by user
+        if (!ed.toggleEnable("askUpdateJava"+updVersion).toggleCheckState()) {
+            ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3);
+            ed.setMinimumSize(new Dimension(480, 300));
+            ed.setIcon(JOptionPane.WARNING_MESSAGE);
+            StringBuilder content = new StringBuilder(tr("You are running version {0} of Java.",
+                    "<b>"+System.getProperty("java.version")+"</b>")).append("<br><br>");
+            if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
+                content.append("<b>").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
+                        "Oracle", eolDate)).append("</b><br><br>");
+            }
+            content.append("<b>")
+                   .append(major ?
+                        tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", updVersion) :
+                        tr("You may face critical Java bugs; we highly recommend you to update to Java {0}.", updVersion))
+                   .append("</b><br><br>")
+                   .append(tr("Would you like to update now ?"));
+            ed.setContent(content.toString());
+
+            if (ed.showDialog().getValue() == 2) {
+                try {
+                    openUrl(url);
+                } catch (IOException e) {
+                    Main.warn(e);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if the running version of Java has expired, proposes to user to update it if needed.
+     * @since 12219
+     */
+    default void checkExpiredJava() {
+        Date expiration = Utils.getJavaExpirationDate();
+        if (expiration != null && expiration.before(new Date())) {
+            String version = Utils.getJavaLatestVersion();
+            askUpdateJava(version != null ? version : "latest",
+                    Main.pref.get("java.update.url", "https://www.java.com/download"),
+                    DateUtils.getDateFormat(DateFormat.MEDIUM).format(expiration), false);
+        }
+    }
 }
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index c9008f9..64fd594 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -32,6 +32,8 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
 
     private static final PlatformHookOsx ivhandler = new PlatformHookOsx();
 
+    private String oSBuildNumber;
+
     @Override
     public void preStartupHook() {
         // This will merge our MenuBar into the system menu.
@@ -39,6 +41,7 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
         // And will not work when one of the system independent LAFs is used.
         // They just insist on painting themselves...
         Utils.updateSystemProperty("apple.laf.useScreenMenuBar", "true");
+        Utils.updateSystemProperty("apple.awt.application.name", "JOSM");
     }
 
     @Override
@@ -56,27 +59,39 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
             Class<?> preferencesHandler = findHandlerClass("PreferencesHandler");
             Object proxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class<?>[] {
                 quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, ivhandler);
-            try {
-                Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
+            Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
+            if (Utils.getJavaVersion() >= 9) {
+                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
+            } else {
                 setHandlers(eawtApplication, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, appli);
-                // this method has been deprecated, but without replacement ATM
+                // this method has been deprecated, but without replacement. To remove with Java 9 migration
                 eawtApplication.getDeclaredMethod("setEnabledPreferencesMenu", boolean.class).invoke(appli, Boolean.TRUE);
-                // setup the dock icon. It is automatically set with application bundle and Web start but we need
-                // to do it manually if run with `java -jar``
-                eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(appli, ImageProvider.get("logo").getImage());
-                // enable full screen
-                enableOSXFullscreen((Window) Main.parent);
-            } catch (IllegalAccessException e) {
-                Main.debug(e);
-                // with Java 9, module java.desktop does not export com.apple.eawt, use new Desktop API instead
-                setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
             }
+            // setup the dock icon. It is automatically set with application bundle and Web start but we need
+            // to do it manually if run with `java -jar``
+            eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(appli, ImageProvider.get("logo").getImage());
+            // enable full screen
+            enableOSXFullscreen((Window) Main.parent);
         } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException ex) {
             // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows.
             Main.warn("Failed to register with OSX: " + ex);
         }
+        checkExpiredJava();
     }
 
+    /**
+     * Registers Apple handlers.
+     * @param appClass application class
+     * @param quitHandler quit handler class
+     * @param aboutHandler about handler class
+     * @param openFilesHandler open file handler class
+     * @param preferencesHandler preferences handler class
+     * @param proxy proxy
+     * @param appInstance application instance (instance of {@code appClass})
+     * @throws IllegalAccessException in case of reflection error
+     * @throws InvocationTargetException in case of reflection error
+     * @throws NoSuchMethodException if any {@code set*Handler} method cannot be found
+     */
     protected void setHandlers(Class<?> appClass, Class<?> quitHandler, Class<?> aboutHandler,
             Class<?> openFilesHandler, Class<?> preferencesHandler, Object proxy, Object appInstance)
                     throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
@@ -86,11 +101,19 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
         appClass.getDeclaredMethod("setPreferencesHandler", preferencesHandler).invoke(appInstance, proxy);
     }
 
+    /**
+     * Find Apple handler class in {@code com.apple.eawt} or {@code java.awt.desktop} packages.
+     * @param className simple class name
+     * @return class
+     * @throws ClassNotFoundException if the handler class cannot be found
+     */
     protected Class<?> findHandlerClass(String className) throws ClassNotFoundException {
         try {
+            // Java 8 handlers
             return Class.forName("com.apple.eawt."+className);
         } catch (ClassNotFoundException e) {
             Main.trace(e);
+            // Java 9 handlers
             return Class.forName("java.awt.desktop."+className);
         }
     }
@@ -365,6 +388,29 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
         return System.getProperty("os.name") + ' ' + System.getProperty("os.version");
     }
 
+    private String buildOSBuildNumber() {
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append(exec("sw_vers", "-productName"))
+              .append(' ')
+              .append(exec("sw_vers", "-productVersion"))
+              .append(" (")
+              .append(exec("sw_vers", "-buildVersion"))
+              .append(')');
+        } catch (IOException e) {
+            Main.error(e);
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public String getOSBuildNumber() {
+        if (oSBuildNumber == null) {
+            oSBuildNumber = buildOSBuildNumber();
+        }
+        return oSBuildNumber;
+    }
+
     @Override
     public File getDefaultCacheDirectory() {
         return new File(System.getProperty("user.home")+"/Library/Caches",
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
index 07456b5..93ee5a9 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
@@ -4,38 +4,68 @@ package org.openstreetmap.josm.tools;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Desktop;
-import java.awt.Dimension;
 import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 
 /**
- * {@code PlatformHook} base implementation.
- *
- * Don't write (Main.platform instanceof PlatformHookUnixoid) because other platform
- * hooks are subclasses of this class.
+ * {@code PlatformHook} implementation for Unix systems.
+ * @since 1023
  */
 public class PlatformHookUnixoid implements PlatformHook {
 
     private String osDescription;
 
+    // rpm returns translated string "package %s is not installed\n", can't find a way to force english output
+    // translations from https://github.com/rpm-software-management/rpm
+    private static final String[] NOT_INSTALLED = {
+            "not installed",          // en
+            "no s'ha instal·lat",     // ca
+            "尚未安裝",                // cmn
+            "není nainstalován",      // cs
+            "ikke installeret",       // da
+            "nicht installiert",      // de
+            "ne estas instalita",     // eo
+            "no está instalado",      // es
+            "ole asennettu",          // fi
+            "pas installé",           // fr
+            "non è stato installato", // it
+            "はインストールされていません。",   // ja
+            "패키지가 설치되어 있지 않습니다", // ko
+            "ikke installert",        // nb
+            "nie jest zainstalowany", // pl
+            "não está instalado",     // pt
+            "не установлен",          // ru
+            "ni nameščen",            // sl
+            "nie je nainštalovaný",   // sk
+            "није инсталиран",        // sr
+            "inte installerat",       // sv
+            "kurulu değil",           // tr
+            "не встановлено",         // uk
+            "chưa cài đặt gói",       // vi
+            "未安装软件包",             // zh_CN
+            "尚未安裝"                // zh_TW
+    };
+
     @Override
     public void preStartupHook() {
         // See #12022 - Disable GNOME ATK Java wrapper as it causes a lot of serious trouble
@@ -100,16 +130,6 @@ public class PlatformHookUnixoid implements PlatformHook {
     }
 
     /**
-     * Determines if the JVM is OpenJDK-based.
-     * @return {@code true} if {@code java.home} contains "openjdk", {@code false} otherwise
-     * @since 6951
-     */
-    public static boolean isOpenJDK() {
-        String javaHome = System.getProperty("java.home");
-        return javaHome != null && javaHome.contains("openjdk");
-    }
-
-    /**
      * Get the package name including detailed version.
      * @param packageNames The possible package names (when a package can have different names on different distributions)
      * @return The package name and package version if it can be identified, null otherwise
@@ -133,7 +153,11 @@ public class PlatformHookUnixoid implements PlatformHook {
                         args = new String[] {"rpm", "-q", "--qf", "%{arch}-%{version}", packageName};
                     }
                     String version = Utils.execOutput(Arrays.asList(args));
-                    if (version != null && !version.contains("not installed")) {
+                    if (version != null) {
+                        for (String notInstalled : NOT_INSTALLED) {
+                            if (version.contains(notInstalled))
+                                break;
+                        }
                         return packageName + ':' + version;
                     }
                 }
@@ -200,23 +224,20 @@ public class PlatformHookUnixoid implements PlatformHook {
         return null;
     }
 
-    protected String buildOSDescription() {
+    private String buildOSDescription() {
         String osName = System.getProperty("os.name");
         if ("Linux".equalsIgnoreCase(osName)) {
             try {
                 // Try lsb_release (only available on LSB-compliant Linux systems,
                 // see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
-                Process p = Runtime.getRuntime().exec("lsb_release -ds");
-                try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
-                    String line = Utils.strip(input.readLine());
-                    if (line != null && !line.isEmpty()) {
-                        line = line.replaceAll("\"+", "");
-                        line = line.replaceAll("NAME=", ""); // strange code for some Gentoo's
-                        if (line.startsWith("Linux ")) // e.g. Linux Mint
-                            return line;
-                        else if (!line.isEmpty())
-                            return "Linux " + line;
-                    }
+                String line = exec("lsb_release -ds");
+                if (line != null && !line.isEmpty()) {
+                    line = line.replaceAll("\"+", "");
+                    line = line.replaceAll("NAME=", ""); // strange code for some Gentoo's
+                    if (line.startsWith("Linux ")) // e.g. Linux Mint
+                        return line;
+                    else if (!line.isEmpty())
+                        return "Linux " + line;
                 }
             } catch (IOException e) {
                 Main.debug(e);
@@ -249,7 +270,7 @@ public class PlatformHookUnixoid implements PlatformHook {
         return osDescription;
     }
 
-    protected static class LinuxReleaseInfo {
+    private static class LinuxReleaseInfo {
         private final String path;
         private final String descriptionField;
         private final String idField;
@@ -257,15 +278,15 @@ public class PlatformHookUnixoid implements PlatformHook {
         private final boolean plainText;
         private final String prefix;
 
-        public LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField) {
+        LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField) {
             this(path, descriptionField, idField, releaseField, false, null);
         }
 
-        public LinuxReleaseInfo(String path) {
+        LinuxReleaseInfo(String path) {
             this(path, null, null, null, true, null);
         }
 
-        public LinuxReleaseInfo(String path, String prefix) {
+        LinuxReleaseInfo(String path, String prefix) {
             this(path, null, null, null, true, prefix);
         }
 
@@ -278,7 +299,8 @@ public class PlatformHookUnixoid implements PlatformHook {
             this.prefix = prefix;
         }
 
-        @Override public String toString() {
+        @Override
+        public String toString() {
             return "ReleaseInfo [path=" + path + ", descriptionField=" + descriptionField +
                     ", idField=" + idField + ", releaseField=" + releaseField + ']';
         }
@@ -334,41 +356,6 @@ public class PlatformHookUnixoid implements PlatformHook {
         }
     }
 
-    // Method unused, but kept for translation already done. To reuse during Java 9 migration
-    protected void askUpdateJava(final String version, final String url) {
-        GuiHelper.runInEDTAndWait(() -> {
-            ExtendedDialog ed = new ExtendedDialog(
-                    Main.parent,
-                    tr("Outdated Java version"),
-                    new String[]{tr("OK"), tr("Update Java"), tr("Cancel")});
-            // Check if the dialog has not already been permanently hidden by user
-            if (!ed.toggleEnable("askUpdateJava9").toggleCheckState()) {
-                ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3);
-                ed.setMinimumSize(new Dimension(480, 300));
-                ed.setIcon(JOptionPane.WARNING_MESSAGE);
-                StringBuilder content = new StringBuilder(tr("You are running version {0} of Java.", "<b>"+version+"</b>"))
-                        .append("<br><br>");
-                if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
-                    content.append("<b>").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
-                            "Oracle", tr("April 2015"))).append("</b><br><br>"); // TODO: change date once Java 8 EOL is announced
-                }
-                content.append("<b>")
-                       .append(tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "8"))
-                       .append("</b><br><br>")
-                       .append(tr("Would you like to update now ?"));
-                ed.setContent(content.toString());
-
-                if (ed.showDialog().getValue() == 2) {
-                    try {
-                        openUrl(url);
-                    } catch (IOException e) {
-                        Main.warn(e);
-                    }
-                }
-            }
-        });
-    }
-
     /**
      * Get the dot directory <code>~/.josm</code>.
      * @return the dot directory
@@ -437,4 +424,17 @@ public class PlatformHookUnixoid implements PlatformHook {
     public List<File> getDefaultProj4NadshiftDirectories() {
         return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
     }
+
+    @Override
+    public X509Certificate getX509Certificate(CertAmend certAmend)
+            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+        File f = new File("/usr/share/ca-certificates/mozilla", certAmend.getFilename());
+        if (f.exists()) {
+            CertificateFactory fact = CertificateFactory.getInstance("X.509");
+            try (FileInputStream is = new FileInputStream(f)) {
+                return (X509Certificate) fact.generateCertificate(is);
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
index b652c53..dc95fb9 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
@@ -26,6 +26,7 @@ import static java.awt.event.KeyEvent.VK_X;
 import static java.awt.event.KeyEvent.VK_Y;
 import static java.awt.event.KeyEvent.VK_Z;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.WinRegistry.HKEY_LOCAL_MACHINE;
 
 import java.awt.GraphicsEnvironment;
 import java.io.BufferedWriter;
@@ -35,6 +36,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
@@ -63,9 +65,11 @@ import java.util.Locale;
 import java.util.Properties;
 
 import javax.swing.JOptionPane;
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 
 /**
@@ -149,9 +153,37 @@ public class PlatformHookWindows implements PlatformHook {
 
     private static final String WINDOWS_ROOT = "Windows-ROOT";
 
+    private static final String CURRENT_VERSION = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
+
+    private String oSBuildNumber;
+
     @Override
     public void afterPrefStartupHook() {
         extendFontconfig("fontconfig.properties.src");
+        // Workaround for JDK-8180379: crash on Windows 10 1703 with Windows L&F and java < 8u152 / 9+171
+        // To remove during Java 9 migration
+        if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows 10") &&
+                getDefaultStyle().equals(LafPreference.LAF.get())) {
+            try {
+                final int currentBuild = Integer.parseInt(getCurrentBuild());
+                final int javaVersion = Utils.getJavaVersion();
+                final int javaUpdate = Utils.getJavaUpdate();
+                final int javaBuild = Utils.getJavaBuild();
+                // See https://technet.microsoft.com/en-us/windows/release-info.aspx
+                if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 152)
+                        || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 171))) {
+                    // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014
+                    UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE);
+                }
+            } catch (NumberFormatException | ReflectiveOperationException e) {
+                Main.error(e);
+            }
+        }
+    }
+
+    @Override
+    public void startupHook() {
+        checkExpiredJava();
     }
 
     @Override
@@ -249,6 +281,38 @@ public class PlatformHookWindows implements PlatformHook {
                 ((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
     }
 
+    private static String getProductName() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ProductName");
+    }
+
+    private static String getReleaseId() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ReleaseId");
+    }
+
+    private static String getCurrentBuild() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "CurrentBuild");
+    }
+
+    private static String buildOSBuildNumber() {
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append(getProductName()).append(' ')
+              .append(getReleaseId()).append(" (")
+              .append(getCurrentBuild()).append(')');
+        } catch (ReflectiveOperationException e) {
+            Main.error(e);
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public String getOSBuildNumber() {
+        if (oSBuildNumber == null) {
+            oSBuildNumber = buildOSBuildNumber();
+        }
+        return oSBuildNumber;
+    }
+
     /**
      * Loads Windows-ROOT keystore.
      * @return Windows-ROOT keystore
@@ -332,10 +396,16 @@ public class PlatformHookWindows implements PlatformHook {
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
         KeyStore ks = getRootKeystore();
         // Look for certificate to install
-        String alias = ks.getCertificateAlias(trustedCert.getTrustedCertificate());
-        if (alias != null) {
-            // JOSM certificate found, return
-            Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+        try {
+            String alias = ks.getCertificateAlias(trustedCert.getTrustedCertificate());
+            if (alias != null) {
+                // JOSM certificate found, return
+                Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+                return false;
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
+            Main.error(e, "JDK-8172244 occured. Abort HTTPS setup");
             return false;
         }
         if (!GraphicsEnvironment.isHeadless()) {
@@ -565,7 +635,6 @@ public class PlatformHookWindows implements PlatformHook {
         def.add(new FontEntry("nko_tifinagh_vai_osmanya", "Ebrima", "EBRIMA.TTF"));    // ISO 639: ber. Nko only since Win 8
         def.add(new FontEntry("khmer1", "Khmer UI", "KHMERUI.TTF"));                   // ISO 639: km
         def.add(new FontEntry("lao1", "Lao UI", "LAOUI.TTF"));                         // ISO 639: lo
-        def.add(new FontEntry("symbol", "Segoe UI Symbol", "SEGUISYM.TTF"));           // subset of Unicode-encoded symbols
         def.add(new FontEntry("tai_le", "Microsoft Tai Le", "TAILE.TTF"));             // ISO 639: khb
         def.add(new FontEntry("new_tai_lue", "Microsoft New Tai Lue", "NTHAILU.TTF")); // ISO 639: khb
 
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index f10aee7..dec66b9 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -31,13 +31,16 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivilegedAction;
 import java.text.Bidi;
+import java.text.DateFormat;
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.util.AbstractCollection;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -1585,4 +1588,105 @@ public final class Utils {
     public static double toRadians(double angleDeg) {
         return angleDeg * TO_RADIANS;
     }
+
+    /**
+     * Returns the Java version as an int value.
+     * @return the Java version as an int value (8, 9, etc.)
+     * @since 12130
+     */
+    public static int getJavaVersion() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            version = version.substring(2);
+        }
+        // Allow these formats:
+        // 1.8.0_72-ea
+        // 9-ea
+        // 9
+        // 9.0.1
+        int dotPos = version.indexOf('.');
+        int dashPos = version.indexOf('-');
+        return Integer.parseInt(version.substring(0,
+                dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
+    }
+
+    /**
+     * Returns the Java update as an int value.
+     * @return the Java update as an int value (121, 131, etc.)
+     * @since 12217
+     */
+    public static int getJavaUpdate() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            version = version.substring(2);
+        }
+        // Allow these formats:
+        // 1.8.0_72-ea
+        // 9-ea
+        // 9
+        // 9.0.1
+        int undePos = version.indexOf('_');
+        int dashPos = version.indexOf('-');
+        if (undePos > -1) {
+            return Integer.parseInt(version.substring(undePos + 1,
+                    dashPos > -1 ? dashPos : version.length()));
+        }
+        int firstDotPos = version.indexOf('.');
+        int lastDotPos = version.lastIndexOf('.');
+        return firstDotPos > - 1 ? Integer.parseInt(version.substring(firstDotPos + 1,
+                lastDotPos > -1 ? lastDotPos : version.length())) : 0;
+    }
+
+    /**
+     * Returns the Java build number as an int value.
+     * @return the Java build number as an int value (0, 1, etc.)
+     * @since 12217
+     */
+    public static int getJavaBuild() {
+        String version = System.getProperty("java.runtime.version");
+        int bPos = version.indexOf('b');
+        int pPos = version.indexOf('+');
+        return Integer.parseInt(version.substring(bPos > -1 ? bPos + 1 : pPos + 1, version.length()));
+    }
+
+    /**
+     * Returns the JRE expiration date.
+     * @return the JRE expiration date, or null
+     * @since 12219
+     */
+    public static Date getJavaExpirationDate() {
+        try {
+            Object value = null;
+            Class<?> c = Class.forName("com.sun.deploy.config.BuiltInProperties");
+            try {
+                value = c.getDeclaredField("JRE_EXPIRATION_DATE").get(null);
+            } catch (NoSuchFieldException e) {
+                // Field is gone with Java 9, there's a method instead
+                Main.trace(e);
+                value = c.getDeclaredMethod("getProperty", String.class).invoke(null, "JRE_EXPIRATION_DATE");
+            }
+            if (value instanceof String) {
+                return DateFormat.getDateInstance(3, Locale.US).parse((String) value);
+            }
+        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException | ParseException e) {
+            Main.debug(e);
+        }
+        return null;
+    }
+
+    /**
+     * Returns the latest version of Java, from Oracle website.
+     * @return the latest version of Java, from Oracle website
+     * @since 12219
+     */
+    public static String getJavaLatestVersion() {
+        try {
+            return HttpClient.create(
+                    new URL(Main.pref.get("java.baseline.version.url", "http://javadl-esd-secure.oracle.com/update/baseline.version")))
+                    .connect().fetchContent().split("\n")[0];
+        } catch (IOException e) {
+            Main.error(e);
+        }
+        return null;
+    }
 }
diff --git a/src/org/openstreetmap/josm/tools/WinRegistry.java b/src/org/openstreetmap/josm/tools/WinRegistry.java
new file mode 100644
index 0000000..9c73733
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/WinRegistry.java
@@ -0,0 +1,199 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.prefs.Preferences;
+
+/**
+ * Utility class to access Window registry (read access only).
+ * As the implementation relies on internal JDK class {@code java.util.prefs.WindowsPreferences} and its native JNI
+ * method {@code Java_java_util_prefs_WindowsPreferences_WindowsRegQueryValueEx}, only String values (REG_SZ)
+ * are supported.
+ * Adapted from <a href="http://stackoverflow.com/a/6163701/2257172">StackOverflow</a>.
+ * @since 12217
+ */
+public final class WinRegistry {
+
+    /**
+     * Registry entries subordinate to this key define the preferences of the current user.
+     * These preferences include the settings of environment variables, data about program groups,
+     * colors, printers, network connections, and application preferences.
+     * See <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms724836(v=vs.85).aspx">Predefined Keys</a>
+     */
+    public static final int HKEY_CURRENT_USER = 0x80000001;
+
+    /**
+     * Registry entries subordinate to this key define the physical state of the computer, including data about the bus type,
+     * system memory, and installed hardware and software. It contains subkeys that hold current configuration data,
+     * including Plug and Play information (the Enum branch, which includes a complete list of all hardware that has ever been
+     * on the system), network logon preferences, network security information, software-related information (such as server
+     * names and the location of the server), and other system information.
+     * See <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms724836(v=vs.85).aspx">Predefined Keys</a>
+     */
+    public static final int HKEY_LOCAL_MACHINE = 0x80000002;
+
+    private static final int REG_SUCCESS = 0;
+
+    private static final int KEY_READ = 0x20019;
+    private static final Preferences userRoot = Preferences.userRoot();
+    private static final Preferences systemRoot = Preferences.systemRoot();
+    private static final Class<? extends Preferences> userClass = userRoot.getClass();
+    private static final Method regOpenKey;
+    private static final Method regCloseKey;
+    private static final Method regQueryValueEx;
+    private static final Method regEnumValue;
+    private static final Method regQueryInfoKey;
+    private static final Method regEnumKeyEx;
+
+    static {
+        try {
+            regOpenKey = userClass.getDeclaredMethod("WindowsRegOpenKey", int.class, byte[].class, int.class);
+            regCloseKey = userClass.getDeclaredMethod("WindowsRegCloseKey", int.class);
+            regQueryValueEx = userClass.getDeclaredMethod("WindowsRegQueryValueEx", int.class, byte[].class);
+            regEnumValue = userClass.getDeclaredMethod("WindowsRegEnumValue", int.class, int.class, int.class);
+            regQueryInfoKey = userClass.getDeclaredMethod("WindowsRegQueryInfoKey1", int.class);
+            regEnumKeyEx = userClass.getDeclaredMethod("WindowsRegEnumKeyEx", int.class, int.class, int.class);
+            Utils.setObjectsAccessible(regOpenKey, regCloseKey, regQueryValueEx, regEnumValue, regQueryInfoKey, regEnumKeyEx);
+        } catch (SecurityException | ReflectiveOperationException e) {
+            throw new JosmRuntimeException(e);
+        }
+    }
+
+    private WinRegistry() {
+        // Hide default constructor for utilities classes
+    }
+
+    /**
+     * Read a value from key and value name
+     * @param hkey  HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @param key  key name
+     * @param valueName  value name
+     * @return the value
+     * @throws IllegalArgumentException if hkey not HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     */
+    public static String readString(int hkey, String key, String valueName)
+            throws IllegalAccessException, InvocationTargetException {
+        if (hkey == HKEY_LOCAL_MACHINE) {
+            return readString(systemRoot, hkey, key, valueName);
+        } else if (hkey == HKEY_CURRENT_USER) {
+            return readString(userRoot, hkey, key, valueName);
+        } else {
+            throw new IllegalArgumentException("hkey=" + hkey);
+        }
+    }
+
+    /**
+     * Read value(s) and value name(s) form given key
+     * @param hkey  HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @param key  key name
+     * @return the value name(s) plus the value(s)
+     * @throws IllegalArgumentException if hkey not HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     */
+    public static Map<String, String> readStringValues(int hkey, String key)
+            throws IllegalAccessException, InvocationTargetException {
+        if (hkey == HKEY_LOCAL_MACHINE) {
+            return readStringValues(systemRoot, hkey, key);
+        } else if (hkey == HKEY_CURRENT_USER) {
+            return readStringValues(userRoot, hkey, key);
+        } else {
+            throw new IllegalArgumentException("hkey=" + hkey);
+        }
+    }
+
+    /**
+     * Read the value name(s) from a given key
+     * @param hkey  HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @param key  key name
+     * @return the value name(s)
+     * @throws IllegalArgumentException if hkey not HKEY_CURRENT_USER/HKEY_LOCAL_MACHINE
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     */
+    public static List<String> readStringSubKeys(int hkey, String key)
+            throws IllegalAccessException, InvocationTargetException {
+        if (hkey == HKEY_LOCAL_MACHINE) {
+            return readStringSubKeys(systemRoot, hkey, key);
+        } else if (hkey == HKEY_CURRENT_USER) {
+            return readStringSubKeys(userRoot, hkey, key);
+        } else {
+            throw new IllegalArgumentException("hkey=" + hkey);
+        }
+    }
+
+    // =====================
+
+    private static String readString(Preferences root, int hkey, String key, String value)
+            throws IllegalAccessException, InvocationTargetException {
+        int[] handles = (int[]) regOpenKey.invoke(root,
+                new Object[] { Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ) });
+        if (handles[1] != REG_SUCCESS) {
+            return null;
+        }
+        byte[] valb = (byte[]) regQueryValueEx.invoke(root, new Object[] { Integer.valueOf(handles[0]), toCstr(value) });
+        regCloseKey.invoke(root, new Object[] { Integer.valueOf(handles[0]) });
+        return (valb != null ? new String(valb, StandardCharsets.UTF_8).trim() : null);
+    }
+
+    private static Map<String, String> readStringValues(Preferences root, int hkey, String key)
+            throws IllegalAccessException, InvocationTargetException {
+        HashMap<String, String> results = new HashMap<>();
+        int[] handles = (int[]) regOpenKey.invoke(root,
+                new Object[] { Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ) });
+        if (handles[1] != REG_SUCCESS) {
+            return null;
+        }
+        int[] info = (int[]) regQueryInfoKey.invoke(root, new Object[] { Integer.valueOf(handles[0]) });
+
+        int count = info[0]; // count
+        int maxlen = info[3]; // value length max
+        for (int index = 0; index < count; index++) {
+            byte[] name = (byte[]) regEnumValue.invoke(root,
+                    new Object[] { Integer.valueOf(handles[0]), Integer.valueOf(index), Integer.valueOf(maxlen + 1) });
+            String value = readString(hkey, key, new String(name, StandardCharsets.UTF_8));
+            results.put(new String(name, StandardCharsets.UTF_8).trim(), value);
+        }
+        regCloseKey.invoke(root, new Object[] { Integer.valueOf(handles[0]) });
+        return results;
+    }
+
+    private static List<String> readStringSubKeys(Preferences root, int hkey, String key)
+            throws IllegalAccessException, InvocationTargetException {
+        List<String> results = new ArrayList<>();
+        int[] handles = (int[]) regOpenKey.invoke(root,
+                new Object[] { Integer.valueOf(hkey), toCstr(key), Integer.valueOf(KEY_READ) });
+        if (handles[1] != REG_SUCCESS) {
+            return Collections.emptyList();
+        }
+        int[] info = (int[]) regQueryInfoKey.invoke(root, new Object[] { Integer.valueOf(handles[0]) });
+
+        int count = info[0]; // Fix: info[2] was being used here with wrong results. Suggested by davenpcj, confirmed by Petrucio
+        int maxlen = info[3]; // value length max
+        for (int index = 0; index < count; index++) {
+            byte[] name = (byte[]) regEnumKeyEx.invoke(root,
+                    new Object[] { Integer.valueOf(handles[0]), Integer.valueOf(index), Integer.valueOf(maxlen + 1) });
+            results.add(new String(name, StandardCharsets.UTF_8).trim());
+        }
+        regCloseKey.invoke(root, new Object[] { Integer.valueOf(handles[0]) });
+        return results;
+    }
+
+    // utility
+    private static byte[] toCstr(String str) {
+        byte[] array = str.getBytes(StandardCharsets.UTF_8);
+        byte[] biggerCopy = Arrays.copyOf(array, array.length + 1);
+        biggerCopy[array.length] = 0;
+        return biggerCopy;
+    }
+}
diff --git a/src/org/openstreetmap/josm/tools/XmlObjectParser.java b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
index 2895b5b..24173df 100644
--- a/src/org/openstreetmap/josm/tools/XmlObjectParser.java
+++ b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
@@ -156,7 +155,7 @@ public class XmlObjectParser implements Iterable<Object> {
                         m.invoke(c, new Object[]{getValueForClass(m.getParameterTypes()[0], value)});
                     }
                 }
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            } catch (ReflectiveOperationException | IllegalArgumentException e) {
                 Main.error(e); // SAXException does not dump inner exceptions.
                 throwException(e);
             }
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index c44bc6d..10060ff 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -1886,6 +1886,7 @@ area[shop=paint],
 area[shop=pawnbroker],
 area[shop=seafood],
 area[shop=dairy],
+area[shop=cheese],
 area[shop=shoes],
 area[shop=sports],
 area[shop=stationery],
@@ -2137,6 +2138,10 @@ node[shop=dairy] {
     icon-image: "presets/shop/groceries/dairy.svg";
     set icon_z17;
 }
+node[shop=cheese] {
+    icon-image: "presets/shop/groceries/cheese.svg";
+    set icon_z17;
+}
 node[shop=shoes] {
     icon-image: "presets/shop/shoes.svg";
     set icon_z17;
diff --git a/test/data/empty.osm b/test/data/empty.osm
new file mode 100644
index 0000000..1f9873a
--- /dev/null
+++ b/test/data/empty.osm
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='never' generator='JOSM'>
+</osm>
diff --git a/test/data/regress/14754/malformed_for_14754.osm b/test/data/regress/14754/malformed_for_14754.osm
new file mode 100644
index 0000000..6aebdd9
--- /dev/null
+++ b/test/data/regress/14754/malformed_for_14754.osm
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='never' generator='JOSM'>
+  <bounds minlat='55.3310119' minlon='10.493499' maxlat='55.3313171' maxlon='10.4944539' origin='CGImap 0.6.0 (14790 thorn-01.openstreetmap.org)' />
+  <node id='1425145996' timestamp='2011-09-06T13:32:55Z' uid='445576' user='Krægpøth' version='1' changeset='9227321' lat='55.3295347' lon='10.494432' />
+  <node id='1425146006' action='modify' timestamp='2011-09-06T13:32:55Z' uid='445576' user='Krægpøth' version='1' changeset='9227321' lat='550.3311950157' lon='10.49428298298' />
+  <node id='1432736611' timestamp='2015-07-09T09:57:07Z' uid='207581' user='Hjart' version='2' changeset='32514866' lat='55.3365712' lon='10.5010424' />
+</osm>
diff --git a/test/data/regress/14788/remove_sign_test_4.osm b/test/data/regress/14788/remove_sign_test_4.osm
new file mode 100644
index 0000000..10362d6
--- /dev/null
+++ b/test/data/regress/14788/remove_sign_test_4.osm
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6" upload='never'>
+    <bounds minlat="45.4333839417" minlon="12.3324651718" maxlat="45.4374351501" maxlon="12.3392772675"/>
+    <node id="978" visible="true" version="10" changeset="12345678" timestamp="2017-05-13T05:47:18Z" user="Tharindu" uid="123456" lat="nan" lon="nan">
+        <tag k="sign" v="yes"/>
+        <tag k="appeal" v="0.620945"/>
+        <tag k="name" v="Piazza San Marco"/>
+        <tag k="tourism" v="information"/>
+        <tag k="information" v="guidepost"/>
+    </node>
+</osm>
diff --git a/test/data/sessions/bing.jos b/test/data/sessions/bing.jos
index 16c9bd4..d17e8ba 100644
--- a/test/data/sessions/bing.jos
+++ b/test/data/sessions/bing.jos
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <josm-session version="0.1">
     <viewport>
-        <center lat="1" lon="1"/>
-        <scale meter-per-pixel="9"/>
+        <center lat="43.13272938585711" lon="131.91090255707502"/>
+        <scale meter-per-pixel="0.21789683764431256"/>
     </viewport>
-    <layers active="1">
+    <layers>
         <layer index="1" name="Bing aerial imagery" type="imagery" version="0.1" visible="true">
             <name>Bing aerial imagery</name>
             <id>Bing</id>
             <type>bing</type>
             <url>http://www.bing.com/maps/</url>
+            <permission-reference-url>http://wiki.openstreetmap.org/wiki/Bing_Maps</permission-reference-url>
             <max-zoom>22</max-zoom>
+            <projections/>
+            <icon>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAdVBMVEX/phX/04r/////6cX/zXz/7Mz/vFD/u0z/1I7/tT3/yXH/uEX/v1f/rCT/2pz/vlP/qRz/4a//yG3/xmn//Pj/9eb/+/T/897/t0H/wl7/sTL//vv/+O3/2Jn/7dD/+vH/9+n/3KT/tDr/9OL/8Nf/26D/ynSCVQVOAAAAkklEQVR4Xq3R1w7DIBQD0NiQne69d///E3tvBYVU6UsVPyEdCYycIOlOv5AB004Aaf6DCpLtF4yxp8tkFMGCkiEkKyGz9qCxrkxuhLIAeaijMvAwi/vMycJDuyi5/AVUaPwTPik5UdCDiWCjtd5Q70TK+KKD26M+6o+tdGxwIlmFPeyZn1yuraFKFOnt/sCz/81f+9UEaf1lPCAAAAAASUVORK5CYII=</icon>
+            <noTileHeaders>{"X-VE-Tile-Info":["no-tile"]}</noTileHeaders>
+            <metadataHeaders>{"X-VE-TILEMETA-CaptureDatesRange":"Capture Date"}</metadataHeaders>
             <automatic-downloading>true</automatic-downloading>
             <automatically-change-resolution>true</automatically-change-resolution>
             <show-errors>true</show-errors>
-            <dx>12.34</dx>
-            <dy>-56.78</dy>
+            <offset>
+                <projection-code>EPSG:3857</projection-code>
+                <imagery-name>bing</imagery-name>
+                <name>Autogenerated</name>
+                <dx>-2.671667778864503</dx>
+                <dy>13.89643478114158</dy>
+                <center-lon>131.9107529</center-lon>
+                <center-lat>43.1329032</center-lat>
+            </offset>
         </layer>
     </layers>
 </josm-session>
diff --git a/test/data/wmts/WMTSCapabilities-GeoAdminCh.xml b/test/data/wmts/WMTSCapabilities-GeoAdminCh.xml
new file mode 100644
index 0000000..08c47a7
--- /dev/null
+++ b/test/data/wmts/WMTSCapabilities-GeoAdminCh.xml
@@ -0,0 +1,13458 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" version="1.0.0">
+<!-- Revision: $Rev$ -->
+<ows:ServiceIdentification>
+        <ows:Title>WMTS IFDG</ows:Title>
+        <ows:Abstract>None</ows:Abstract>
+        <ows:Keywords>
+            <ows:Keyword>Switzerland</ows:Keyword>
+            <ows:Keyword>Web Map Service</ows:Keyword>
+            <ows:Keyword>Suisse</ows:Keyword>
+            <ows:Keyword>OGC</ows:Keyword>
+            <ows:Keyword>WMS</ows:Keyword>
+            <ows:Keyword>swisstopo</ows:Keyword>
+            <ows:Keyword>Office federal de topographie</ows:Keyword>
+            <ows:Keyword>Carte nationale</ows:Keyword>
+            <ows:Keyword>Cartes-pixel</ows:Keyword>
+            <ows:Keyword>Images aeriennes</ows:Keyword>
+            <ows:Keyword>SWISSIMAGE</ows:Keyword>
+            <ows:Keyword>Frontieres</ows:Keyword>
+            <ows:Keyword>swissBOUNDARIES3D</ows:Keyword>
+            <ows:Keyword>Cartes historiques</ows:Keyword>
+            <ows:Keyword>Atlas Siegfried</ows:Keyword>
+            <ows:Keyword>Carte Dufour</ows:Keyword>
+        </ows:Keywords>
+        <ows:ServiceType>OGC WMTS</ows:ServiceType>
+        <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+        <ows:Fees>None</ows:Fees>
+        <ows:AccessConstraints>None</ows:AccessConstraints>
+</ows:ServiceIdentification>
+<ows:ServiceProvider>
+        <ows:ProviderName>Office fédéral de topographie swisstopo </ows:ProviderName>
+        <ows:ProviderSite xlink:href="http://www.swisstopo.admin.ch"/>
+        <ows:ServiceContact>
+            <ows:IndividualName>David Oesch</ows:IndividualName>
+            <ows:PositionName></ows:PositionName>
+            <ows:ContactInfo>
+                <ows:Phone>
+                    <ows:Voice>+41 58 469 01 11</ows:Voice>
+                    <ows:Facsimile>+41 58 469 04 59</ows:Facsimile>
+                </ows:Phone>
+                <ows:Address>
+                    <ows:DeliveryPoint>swisstopo</ows:DeliveryPoint>
+                    <ows:City>Bern</ows:City>
+                    <ows:AdministrativeArea>BE</ows:AdministrativeArea>
+                    <ows:PostalCode>3084</ows:PostalCode>
+                    <ows:Country>Switzerland</ows:Country>
+                    <ows:ElectronicMailAddress>webgis at swisstopo.ch</ows:ElectronicMailAddress>
+                </ows:Address>
+            </ows:ContactInfo>
+        </ows:ServiceContact>
+</ows:ServiceProvider>
+
+   <ows:OperationsMetadata>
+        <ows:Operation name="GetCapabilities">
+            <ows:DCP>
+                <ows:HTTP>
+                    <ows:Get xlink:href="http://wmts.geo.admin.ch/1.0.0/WMTSCapabilities.xml">
+                        <ows:Constraint name="GetEncoding">
+                            <ows:AllowedValues>
+                                <ows:Value>REST</ows:Value>
+                            </ows:AllowedValues>
+                        </ows:Constraint>
+                    </ows:Get>
+                </ows:HTTP>
+            </ows:DCP>
+        </ows:Operation>
+        <ows:Operation name="GetTile">
+            <ows:DCP>
+                <ows:HTTP>
+                    <ows:Get xlink:href="http://wmts.geo.admin.ch/">
+                        <ows:Constraint name="GetEncoding">
+                            <ows:AllowedValues>
+                                <ows:Value>REST</ows:Value>
+                            </ows:AllowedValues>
+                        </ows:Constraint>
+                    </ows:Get>
+                </ows:HTTP>
+            </ows:DCP>
+        </ows:Operation>
+    </ows:OperationsMetadata>
+    <Contents>
+
+        <Layer>
+            <ows:Title>Agglomérations et villes isolées</ows:Title>
+            <ows:Abstract>Les agglomérations et villes isolées (communes non rattachées à une agglomération et comptant au moins 10`000 habitants) font partie des régions d’analyse de la statistique suisse. Ce niveau géographique est défini depuis plus de 100 ans, afin de mesurer l’urbanisation, phénomène fondamental structurant l’organisation du territoire. Sa fonction principale est de permettre une comparaison spatiale entre des espaces urbains inégalement délimités sur le plan instit [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.are.agglomerationen_isolierte_staedte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c1a563a5-3af3-4fd6-b2fd-1e4b010f0fc4"/>
+            <Style>
+                <ows:Title>Agglomérations et villes isolées</ows:Title>
+                <ows:Identifier>ch.are.agglomerationen_isolierte_staedte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.are.agglomerationen_isolierte_staedte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.are.agglomerationen_isolierte_staedte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Convention des Alpes</ows:Title>
+            <ows:Abstract>Périmètre de la Convention alpine en Suisse. La Convention alpine est un traité de droit international conclu par huit Etats alpins (Allemagne, Autriche, France, Italie, Liechtenstein, Monaco, Suisse, Slovénie) et l`Union européenne. L`accord vise à assurer la préservation et la protection des Alpes à travers une politique plurisectorielle, globale et durable.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.are.alpenkonvention</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8698bf0b-fceb-4f0f-989b-111e7c4af0a4"/>
+            <Style>
+                <ows:Title>Convention des Alpes</ows:Title>
+                <ows:Identifier>ch.are.alpenkonvention</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.are.alpenkonvention_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090101</Default>
+                <Value>20090101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.are.alpenkonvention/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Typologie des communes ARE</ows:Title>
+            <ows:Abstract>La typologie des communes ARE est le résultat d’une combinaison entre la définition des grands régions, des agglomérations 2000 et de la typologie des communes de l’Office fédéral de la statistique OFS. Neuf types de communes ont été dérivés à partir des 13 types d'origine.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.are.gemeindetypen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c967f055-9482-4bcb-a1bb-8de7971e7293"/>
+            <Style>
+                <ows:Title>Typologie des communes ARE</ows:Title>
+                <ows:Identifier>ch.are.gemeindetypen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.are.gemeindetypen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.are.gemeindetypen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>inventaire des logements</ows:Title>
+            <ows:Abstract>La loi fédérale sur les résidences secondaire (LRS ; RS 702) oblige toutes les communes suisses à procéder chaque année à un inventaire des logements. Le Registre fédéral des bâtiments et des logements (RegBL) constitue la base pour ce faire. Ce registre est actualisé par les communes et analysé par l'Office fédéral du développement territorial au 31 décembre. L'inventaire des logements est publié chaque année à la fin mars.Le 11 mars 2012, le peuple et  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.are.wohnungsinventar-zweitwohnungsanteil</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ed80ebde-99a0-4523-bc8a-4ec23426d966"/>
+            <Style>
+                <ows:Title>inventaire des logements</ows:Title>
+                <ows:Identifier>ch.are.wohnungsinventar-zweitwohnungsanteil</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.are.wohnungsinventar-zweitwohnungsanteil_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.are.wohnungsinventar-zweitwohnungsanteil/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS Carte de terrain</ows:Title>
+            <ows:Abstract>L'inventaire initial est basé sur la carte topographique qui fournit des indications supplémentaires sur les objets définis à l'article 3 de l'ordonnance sur l'inventaire fédéral des voies de communication historiques de la Suisse (OIVS) ainsi que ceux d'importance régionale et locale. Etant donné que, dans un premier temps, la carte topographique n'est pas mise à jour, elle ne figure qu'à titre d'information complémentaire dans l [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-gelaendekarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c99e4a84-b340-4c83-ad3f-f5bcb15a1bf1"/>
+            <Style>
+                <ows:Title>IVS Carte de terrain</ows:Title>
+                <ows:Identifier>ch.astra.ivs-gelaendekarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-gelaendekarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151231</Default>
+                <Value>20151231</Value>
+                <Value>19980816</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-gelaendekarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS National</ows:Title>
+            <ows:Abstract>L’inventaire des voies de communication de la Suisse (IVS) offre une mine d’informations sur leur tracé, leur histoire, leur état et leur importance, conformément aux dispositions de la loi fédérale sur la protection de la nature et du paysage (LPN). L’IVS comprend deux parties : l’inventaire fédéral et les autres voies de communication historiques (ordonnance concernant l’inventaire fédéral des voies de communication historiques de la Suisse OIVS, art. 3). La p [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-nat</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=70b6e2ac-c7ea-4699-a22e-65792aa3b0b9"/>
+            <Style>
+                <ows:Title>IVS National</ows:Title>
+                <ows:Identifier>ch.astra.ivs-nat</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-nat_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100416</Default>
+                <Value>20100416</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-nat/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS Délimitations</ows:Title>
+            <ows:Abstract>Les délimitations font partie de la carte de l'inventaire indépendamment du classement (national, régional, local). Les délimitations indiquent le début et la fin d'un tronçon d'une voie. Les délimitations sont des objets ponctuels. Lors de la vérification de leurs inventaires des voies de communication historique d'importance régionale ou locale, les cantons de Berne et Schaffhouse ont intégrés des nouveaux tronçons ou subdivisé des tronçons exi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-nat_abgrenzungen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=aab3c0bf-bfa3-48e0-84d7-1a7b86e04509"/>
+            <Style>
+                <ows:Title>IVS Délimitations</ows:Title>
+                <ows:Identifier>ch.astra.ivs-nat_abgrenzungen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-nat_abgrenzungen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151231</Default>
+                <Value>20151231</Value>
+                <Value>20100414</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-nat_abgrenzungen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS import. nat. tracé s. subst.</ows:Title>
+            <ows:Abstract>Le tracé des voies de communication historiques d'importance nationale est une information complémentaire à l'inventaire national. Il montre les voies de communication historiques d'importance nationale qui présentent peu, voire plus de substance, dont le tracé reste visible aujourd'hui (art.2, OIVS). Les tracés représentés ne font pas partie de l'inventaire fédéral.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-nat-verlaeufe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8c750eb5-d781-4b14-8dee-3d8943b04465"/>
+            <Style>
+                <ows:Title>IVS import. nat. tracé s. subst.</ows:Title>
+                <ows:Identifier>ch.astra.ivs-nat-verlaeufe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-nat-verlaeufe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100416</Default>
+                <Value>20100416</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-nat-verlaeufe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS Eléments du paysage routier</ows:Title>
+            <ows:Abstract>Les éléments du paysage routier font partie de la carte de l'inventaire indépendamment du classement (national, régional, local). Ils symbolisent des objets tels que pierre de distance, croix routières, chapelles, embarcadères, bac, fontaines et autres. Les éléments du paysage routier sont des points sans attributs complémentaires. Lors du processus de réévaluation des objets d'importance régional ou local, les cantons de Berne, Bâle-Campagne, Soleure et [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-nat_wegbegleiter</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=3cf031e4-eef0-4c14-8bed-d132393dd4bc"/>
+            <Style>
+                <ows:Title>IVS Eléments du paysage routier</ows:Title>
+                <ows:Identifier>ch.astra.ivs-nat_wegbegleiter</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-nat_wegbegleiter_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151231</Default>
+                <Value>20151231</Value>
+                <Value>20100414</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-nat_wegbegleiter/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IVS Régional et local</ows:Title>
+            <ows:Abstract>L'inventaire des voies de communication de la Suisse (IVS) offre une mine d'informations sur leur tracé, leur histoire, leur état et leur importance conformément aux dispositions de la loi fédérale du 1er juillet 1996 sur la protection de la nature et du paysage (LPN). Outre les objets d'importance nationale qui figurent dans l'inventaire fédéral (à savoir ceux dotés d'une signification historique exceptionnelle) ou apparaissent à titre d&#39 [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ivs-reg_loc</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f59f9e16-1f67-47bf-ade0-fcce715ce6fe"/>
+            <Style>
+                <ows:Title>IVS Régional et local</ows:Title>
+                <ows:Identifier>ch.astra.ivs-reg_loc</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ivs-reg_loc_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151231</Default>
+                <Value>20151231</Value>
+                <Value>20100416</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ivs-reg_loc/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>la Suisse à VTT</ows:Title>
+            <ows:Abstract>"SuisseMobile – La Suisse à VTT Itinéraires nationaux, régionaux, et locaux. La fondation SuisseMobile coordonne les offres de SuisseMobile sur mandat ou en accord avec différents offices fédéraux (Office fédéral des routes, Office fédéral du développement territorial, Secrétariat d'Etat à l'économie, Office fédéral de topographie, Office fédéral de l'énergie, Office fédéral du sport, Office fédéral de l'environnement, Office fédéral des tran [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.mountainbikeland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d4f1ebde-f999-4c56-b4a5-7ec8720a4052"/>
+            <Style>
+                <ows:Title>la Suisse à VTT</ows:Title>
+                <ows:Identifier>ch.astra.mountainbikeland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.mountainbikeland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.mountainbikeland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>la Suisse en rollers</ows:Title>
+            <ows:Abstract>"SuisseMobile – La Suisse en rollers Itinéraires nationaux, régionaux, et locaux . La fondation SuisseMobile coordonne les offres de SuisseMobile sur mandat ou en accord avec différents offices fédéraux (Office fédéral des routes, Office fédéral du développement territorial, Secrétariat d'Etat à l'économie, Office fédéral de topographie, Office fédéral de l'énergie, Office fédéral du sport, Office fédéral de l'environnement, Office fédéral de [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.skatingland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=deeb1f0f-ea25-46f0-977a-6ae1031cc55b"/>
+            <Style>
+                <ows:Title>la Suisse en rollers</ows:Title>
+                <ows:Identifier>ch.astra.skatingland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.skatingland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.skatingland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>la Suisse à vélo</ows:Title>
+            <ows:Abstract>"SuisseMobile – La Suisse à vélo Itinéraires nationaux, régionaux, et locaux. La fondation SuisseMobile coordonne les offres de SuisseMobile sur mandat ou en accord avec différents offices fédéraux (Office fédéral des routes, Office fédéral du développement territorial, Secrétariat d'Etat à l'économie, Office fédéral de topographie, Office fédéral de l'énergie, Office fédéral du sport, Office fédéral de l'environnement, Office fédéral des tra [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.veloland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=16d16fa3-a416-4e8b-99fc-69c7267f134d"/>
+            <Style>
+                <ows:Title>la Suisse à vélo</ows:Title>
+                <ows:Identifier>ch.astra.veloland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.veloland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.veloland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>la Suisse à pied</ows:Title>
+            <ows:Abstract>"SuisseMobile – La Suisse à pied Itinéraires nationaux, régionaux, locaux et chemins sans obstacles. La fondation SuisseMobile coordonne les offres de SuisseMobile sur mandat ou en accord avec différents offices fédéraux (Office fédéral des routes, Office fédéral du développement territorial, Secrétariat d'Etat à l'économie, Office fédéral de topographie, Office fédéral de l'énergie, Office fédéral du sport, Office fédéral de l'environnement, [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.wanderland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=95638869-ef86-4e95-ae60-20e84e8dca8c"/>
+            <Style>
+                <ows:Title>la Suisse à pied</ows:Title>
+                <ows:Identifier>ch.astra.wanderland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.wanderland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.wanderland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Inventaire PBC</ows:Title>
+            <ows:Abstract>Dans la version 2009 de l'Inventaire, les biens culturels d'importance nationale représentent environ 3200 objets (bâtiments, collections dans les musées, archives et bibliothèques ainsi que les objets d'archéologie).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.babs.kulturgueter</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c1a6591c-31a8-416a-a871-666eeeb7dc91"/>
+            <Style>
+                <ows:Title>Inventaire PBC</ows:Title>
+                <ows:Identifier>ch.babs.kulturgueter</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.babs.kulturgueter_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+                <Value>20150101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.babs.kulturgueter/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Végétation dans zones alluviales</ows:Title>
+            <ows:Abstract>Afin de donner la possibilité aux cantons de prendre aussi tôt que possible les mesures nécessaires à la protection des potentielles zones alluviales d’importance nationale, l’OFEFP leur a fourni 1987 une cartographie détaillée de la végétation des objets en consultation. Pour la majeure partie des objets qui ont été agrandis après la consultation, des cartes de végétation ont été élaborées ultérieurement selon la même méthode. Les objets nouvellement admis dans [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.auen-vegetationskarten</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ab76361f-657d-4705-9053-95f89ecab126"/>
+            <Style>
+                <ows:Title>Végétation dans zones alluviales</ows:Title>
+                <ows:Identifier>ch.bafu.auen-vegetationskarten</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.auen-vegetationskarten_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150302</Default>
+                <Value>20150302</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.auen-vegetationskarten/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Batraciens objets fixes</ows:Title>
+            <ows:Abstract>19 espèces de batraciens vivent en Suisse à l'heure actuelle; presque toutes figurent sur la liste rouge des espèces animales menacées. La surface des zones humides abritant les batraciens s'est réduite à moins d'un dixième au cours des cent dernières années. Il convient donc de préserver les habitats existants. La plupart des espèces préfèrent comme plan d'eau de reproduction des eaux stagnantes tels que les mares et les étangs. L'inventaire [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-amphibien</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1b48774e-1047-4e8f-b743-769a2b3901cb"/>
+            <Style>
+                <ows:Title>Batraciens objets fixes</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-amphibien</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-amphibien_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070702</Default>
+                <Value>20070702</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-amphibien/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Batraciens objets itinérants</ows:Title>
+            <ows:Abstract>19 espèces de batraciens vivent en Suisse à l'heure actuelle; presque toutes figurent sur la liste rouge des espèces animales menacées. La surface des zones humides abritant les batraciens s'est réduite à moins d'un dixième au cours des cent dernières années. Il convient donc de préserver les habitats existants. La plupart des espèces préfèrent comme plan d'eau de reproduction des eaux stagnantes tels que les mares et les étangs. L'inventaire [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-amphibien_wanderobjekte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=36a55486-04be-4533-9936-9c05407114a1"/>
+            <Style>
+                <ows:Title>Batraciens objets itinérants</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-amphibien_wanderobjekte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-amphibien_wanderobjekte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070702</Default>
+                <Value>20070702</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-amphibien_wanderobjekte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones alluviales</ows:Title>
+            <ows:Abstract>On entend par zones alluviales les zones inondables en bordure de lacs et cours d'eaux, ces zones constituant des biotopes naturels. En mai 1981, le mandat d'établir l'inventaire scientifique des zones alluviales a été donné par le DFI à l'Institut fédéral des recherches forestières (aujourd'hui Institut fédéral de recherches sur la forêt, la neige et le paysage, FNP). Ce mandat a été élaboré par le groupe "Vegetationskunde" (géograph [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-auen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d47dffc7-8072-40c2-bbf7-4fb47367bd29"/>
+            <Style>
+                <ows:Title>Zones alluviales</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-auen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-auen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070701</Default>
+                <Value>20070701</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-auen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IFP</ows:Title>
+            <ows:Abstract>L'article 5 de la loi fédérale du 1er juillet 1966 sur la protection de la nature et du paysage (LPN) demande au Conseil fédéral de réaliser des inventaires d'objets de signification nationale (inventaires fédéraux). L'inventaire fédéral des paysages et des monuments naturels de importance nationale (IFP) représente le premier inventaire fédéral selon la LPN. La première étape en est l'inventaire CPN (Inventaire des paysages à préserver et des mo [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-bln</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=bc3f1564-1e56-44e9-98b6-f0d8c5130410"/>
+            <Style>
+                <ows:Title>IFP</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-bln</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-bln_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20010809</Default>
+                <Value>20010809</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-bln/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bas-marais</ows:Title>
+            <ows:Abstract>Les bas-marais, témoins des paysages d'autrefois, régressent fortement. Ils abritent une biocénose composée de plantes et d'animaux étroitement liés les uns aux autres et parmi lesquels on trouve un grand nombre d'espèces menacées. L'inventaire scientifique des bas-marais a été réalisé de 1987 à 1990 par une communauté de travail mandatée par le DFI. Aux termes de l'art. 18a de la loi fédérale du 1er juillet 1966 sur la protection de la natur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-flachmoore</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c98723f6-4c76-480b-bada-c8a5ce3d20d8"/>
+            <Style>
+                <ows:Title>Bas-marais</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-flachmoore</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-flachmoore_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100623</Default>
+                <Value>20100623</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-flachmoore/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Hauts-marais</ows:Title>
+            <ows:Abstract>Les tourbières comptent parmi les milieux naturels les plus sensibles de Suisse. Ils sont fortement en recul: seuls 10 à 20% du nombre initial subsistent aujourd'hui. L'inventaire scientifique des tourbières a été effectué entre 1978 et 1984 par la division Paysage du WSL (Institut fédéral de recherches sur la forêt, la neige et le paysage) sur mandat de Pro Natura Helvetica. Conformement à l'art. 18a de la loi fédérale du 1er juillet 1966 sur la pro [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-hochmoore</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2ce98519-dd40-4cc1-bd95-8f4234d78492"/>
+            <Style>
+                <ows:Title>Hauts-marais</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-hochmoore</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-hochmoore_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20080721</Default>
+                <Value>20080721</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-hochmoore/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Districts francs</ows:Title>
+            <ows:Abstract>Les districts francs fédéraux existent depuis 1875. Ils servaient à préserver les populations de chamois, de bouquetins, de cerfs et de chevreuils (ongulés), devenues rares à l'époque en raison de la chasse et de la concurrence du bétail. La situation actuelle se caractérise d'une part par des populations d'ongulés importantes, parfois excessives, et par les dommages qu'elles impliquent, et d'autre part par le recul d'espèces sensibles te [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-jagdbanngebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=200a2d0e-afe1-45d8-aeaf-ea3621cc6afe"/>
+            <Style>
+                <ows:Title>Districts francs</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-jagdbanngebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-jagdbanngebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131202</Default>
+                <Value>20131202</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-jagdbanngebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sites marécageux</ows:Title>
+            <ows:Abstract>Les sites marécageux sont des paysages proches de l'état naturel, caractérisés par la présence de marais et abritant également d'autres éléments culturels et naturels remarquables. Pour nombre d'espèces animales et végétales, ils constituent les derniers espaces vitaux. L'inventaire scientifique des sites marécageux a été dressé dans les années 1987 à 1990 par Hintermann & Weber AG, sur mandat du DFI. Conformément à l'article 23b de la lo [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-moorlandschaften</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7ed73e2f-0a41-4e8b-a7ff-413f2d9b5ece"/>
+            <Style>
+                <ows:Title>Sites marécageux</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-moorlandschaften</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-moorlandschaften_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150202</Default>
+                <Value>20150202</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-moorlandschaften/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Prairies et pâturages secs (PPS)</ows:Title>
+            <ows:Abstract>Les prairies et pâturages secs doivent leur existence à l’agriculture. Ils sont en effet le résultat de plusieurs siècles d’exploitation extensive et d’agriculture traditionnelle. Depuis la fin du 19e siècle, les prairies et pâturages secs ont régressé de près de 90 %. Parallèlement, les espèces qu’ils abritent depuis toujours subissent de plus en plus de pression: presque 40 % de toutes les espèces végétales et 50 % de toutes les espèces animales qui sont tribu [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-trockenwiesen_trockenweiden</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8fa24249-1ad0-48d3-a879-6ba6893db1d7"/>
+            <Style>
+                <ows:Title>Prairies et pâturages secs (PPS)</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-trockenwiesen_trockenweiden</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-trockenwiesen_trockenweiden_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130624</Default>
+                <Value>20130624</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-trockenwiesen_trockenweiden/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réserves d'oiseaux d'eau</ows:Title>
+            <ows:Abstract>La Suisse est un lieu d'hivernage et de repos particulièrement important pour diverses espèces d'oiseaux d'eau migrateurs. Conscient de cette importance, le Conseil Fédéral a signé en 1974 la Convention relative aux zones humides d'importance internationale, conclue à Ramsar en 1971 et ratifiée par l'Assemblée fédérale en 1975.Un inventaire des réserves d'oiseaux d'eau d'importance internationale pour la Suisse a été élaboré en 19 [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-vogelreservate</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8fc6f748-80ce-47b2-8d49-b05a0c8ba975"/>
+            <Style>
+                <ows:Title>Réserves d'oiseaux d'eau</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-vogelreservate</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-vogelreservate_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150923</Default>
+                <Value>20150923</Value>
+                <Value>20150622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-vogelreservate/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Colonies de bouquetins</ows:Title>
+            <ows:Abstract>Réintroduit en 1906, le Bouquetin des Alpes vit en colonies d’extension variable localisées dans le Jura et l’arc alpin. La croissance des populations a entraîné dans certaines colonies des effets néfastes sur d’autres espèces et sur la végétation, rendant nécessaire la prise de mesures de régulation. Les prescriptions relatives à la planification des tirs de bouquetins se fondent sur la loi fédérale du 20 juin 1986 sur la chasse et la protection des mammifères  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.fauna-steinbockkolonien</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9c762bb5-4d8c-4174-9b77-95e85b962439"/>
+            <Style>
+                <ows:Title>Colonies de bouquetins</ows:Title>
+                <ows:Identifier>ch.bafu.fauna-steinbockkolonien</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.fauna-steinbockkolonien_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150506</Default>
+                <Value>20150506</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.fauna-steinbockkolonien/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>SOLID fédéral, alluvions fluv.</ows:Title>
+            <ows:Abstract>Une banque de données pour la détermination des volumes de charriage dans les cours d’eau à l’échelle de la Suisse. Après les événements dévastateurs de l'été 1987, qui ont provoqué des dégâts importants dans un grand nombre de régions de Suisse, le Groupe pour l'Hydrologie Opérationnelle (GHO) a proposé la création d'une banque de données des volumes de charriage. Pour la banque de données Solid, l'OFEV travaille en collaboration avec les canton [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.feststoffe-geschiebemessnetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=05ba053f-60ca-492b-a1f5-bd70f6de8761"/>
+            <Style>
+                <ows:Title>SOLID fédéral, alluvions fluv.</ows:Title>
+                <ows:Identifier>ch.bafu.feststoffe-geschiebemessnetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.feststoffe-geschiebemessnetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090101</Default>
+                <Value>20090101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.feststoffe-geschiebemessnetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ordre des cours d’eau</ows:Title>
+            <ows:Abstract>L’ordre des cours d’eau selon Strahler indique le degré de ramification du réseau hydrographique. Il est une base pour les analyses et descriptions morphologiques d'un cours d'eau. --- Selon Strahler l’ordre 1 est attribué au sources. Si deux cours d’eau de même ordre se rejoignent, l’ordre augmente de 1. Ainsi le Rhin et l’Aar sont d’ordre 9, le Rhône est d’ordre 7. --- Le reseau hydrographique issu de VECTOR25 a servi comme base de calcul pour l'or [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.flussordnungszahlen-strahler</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e8b4794c-7045-4970-85eb-6caba4384976"/>
+            <Style>
+                <ows:Title>Ordre des cours d’eau</ows:Title>
+                <ows:Identifier>ch.bafu.flussordnungszahlen-strahler</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.flussordnungszahlen-strahler_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140805</Default>
+                <Value>20140805</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.flussordnungszahlen-strahler/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Eaux de baignade (qualité)</ows:Title>
+            <ows:Abstract>L'OFEV et l'Office fédéral de la santé publique OFSP ont publié des recommandations pour l'évaluation de la qualité hygiénique des eaux de baignade de lacs et de rivières. Elles servent d'aide à l'exécution pour les cantons et s'appuient sur la directive européenne sur les eaux de baignade de 2006. Cette aide à l'exécution remplace les anciennes recommandations de 1991.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-badewasserqualitaet</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5601eb96-45cb-40a4-a595-2ec0ebda8e8c"/>
+            <Style>
+                <ows:Title>Eaux de baignade (qualité)</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-badewasserqualitaet</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-badewasserqualitaet_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141231</Default>
+                <Value>20141231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-badewasserqualitaet/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Apports diffus de phosphore</ows:Title>
+            <ows:Abstract>Les apports de phosphore dans les eaux constituent une pollution indésirable. D'importantes quantités de phosphore dissous ont, au cours des dernières décennies, mené à une surfertilisation des lacs du Plateau. Au total, près de 900 tonnes de phosphore dissous provenant de sources diffuses se retrouvent chaque année dans les eaux suisses. De grandes quantités de phosphore sont surtout détectées dans les herbages soumis à une exploitation intensive sur des te [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-diffuse_eintraege_phosphor</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9c4bf1ae-ee0a-491c-9ce3-156a3001a954"/>
+            <Style>
+                <ows:Title>Apports diffus de phosphore</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-diffuse_eintraege_phosphor</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-diffuse_eintraege_phosphor_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150701</Default>
+                <Value>20150701</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_20</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-diffuse_eintraege_phosphor/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Apports diffus d'azote</ows:Title>
+            <ows:Abstract>Les apports d'azote dans les eaux constituent une pollution indésirable. Dans le cadre de la Convention pour la protection du milieu marin de l'Atlantique du Nord-Est (OSPAR), la Suisse s'est engagée à réduire de moitié par rapport à 1985 les apports d'azote dans le Rhin. Cet objectif n'est pas encore atteint ; au total, près de 51 000 tonnes d'azote émanant de sources diffuses se retrouvent chaque année dans les eaux suisses. Les apports [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-diffuse_eintraege_stickstoff</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9b7dc233-813b-490b-b13c-3b3ab787e11f"/>
+            <Style>
+                <ows:Title>Apports diffus d'azote</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-diffuse_eintraege_stickstoff</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-diffuse_eintraege_stickstoff_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150701</Default>
+                <Value>20150701</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_20</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-diffuse_eintraege_stickstoff/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ARA - Eaux usées dans Q347</ows:Title>
+            <ows:Abstract>Depuis les années 1980, l’OFEV (anciennement OFEFP) gère une base de données contenant des informations relatives aux stations centrales d’épuration des eaux (STEP). Les fiches techniques de bases ont été remplies par les exploitants de STEP au moment de la construction des installations puis mises à jour de façon irrégulière et non systématique lors de rénovations techniques.Les indicateurs relatifs à l’évacuation des eaux usées proviennent du relevé effectué p [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_anteilq347</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4e8a2a6b-9ede-4107-9b50-6e9af7389144"/>
+            <Style>
+                <ows:Title>ARA - Eaux usées dans Q347</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_anteilq347</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-klaeranlagen_anteilq347_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-klaeranlagen_anteilq347/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ARA - Capacité (EH)</ows:Title>
+            <ows:Abstract>Depuis les années 1980, l’OFEV (anciennement OFEFP) gère une base de données contenant des informations relatives aux stations centrales d’épuration des eaux (STEP). Les fiches techniques de bases ont été remplies par les exploitants de STEP au moment de la construction des installations puis mises à jour de façon irrégulière et non systématique lors de rénovations techniques.Les indicateurs relatifs à l’évacuation des eaux usées proviennent du relevé effectué p [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_ausbaugroesse</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5e06e47a-8d78-440f-b98e-e46cfa52c474"/>
+            <Style>
+                <ows:Title>ARA - Capacité (EH)</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_ausbaugroesse</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-klaeranlagen_ausbaugroesse_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-klaeranlagen_ausbaugroesse/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ARA - Type de traitement</ows:Title>
+            <ows:Abstract>Depuis les années 1980, l’OFEV (anciennement OFEFP) gère une base de données contenant des informations relatives aux stations centrales d’épuration des eaux (STEP). Les fiches techniques de bases ont été remplies par les exploitants de STEP au moment de la construction des installations puis mises à jour de façon irrégulière et non systématique lors de rénovations techniques.Les indicateurs relatifs à l’évacuation des eaux usées proviennent du relevé effectué p [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_reinigungstyp</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c80d9b2e-522e-45cb-a587-c5fe028d63df"/>
+            <Style>
+                <ows:Title>ARA - Type de traitement</ows:Title>
+                <ows:Identifier>ch.bafu.gewaesserschutz-klaeranlagen_reinigungstyp</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.gewaesserschutz-klaeranlagen_reinigungstyp_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.gewaesserschutz-klaeranlagen_reinigungstyp/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Esquisse hydrogéologique</ows:Title>
+            <ows:Abstract>Les eaux souterraines sont présentes dans toutes les roches du sous-sol. La carte donne une vue d’ensemble de l’hydrogéologie de la Suisse et de la répartition des différents types d’aquifères. Les importants aquifères en roche meuble se situent le long des grandes rivières du Plateau et dans les vallées alpines. Une grande partie du Plateau et des Alpes est occupée par des aquifères fissurés. Enfin, les aquifères karstiques sont typiques des Alpes et du Jura.</ [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrogeologie-uebersichtskarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e238580b-a03d-45c2-9ea6-f6634ff9c64c"/>
+            <Style>
+                <ows:Title>Esquisse hydrogéologique</ows:Title>
+                <ows:Identifier>ch.bafu.hydrogeologie-uebersichtskarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrogeologie-uebersichtskarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090101</Default>
+                <Value>20090101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_24</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrogeologie-uebersichtskarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte hydrogéologique au 100</ows:Title>
+            <ows:Abstract>Publiée par l’Office fédéral de l’environnement (OFEV), office compétent du Service géologique national pour l’hydrogéologie.La carte hydrogéologique 1:100 000 présente le sous-sol dans la perspective des trois domaines spécialisés : géologie, hydrologie et hydrogéologie. Le sous-sol est classé d’après des critères lithologiques-pétrographiques et de perméabilité. Les données ponctuelles et linéaires (sources, puits, liaisons hydrauliques, nappes phréatiques, et [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrogeologische-karte_100</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b01523a1-9f61-43a2-95cb-be843cc1b18a"/>
+            <Style>
+                <ows:Title>Carte hydrogéologique au 100</ows:Title>
+                <ows:Identifier>ch.bafu.hydrogeologische-karte_100</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrogeologische-karte_100_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141231</Default>
+                <Value>20141231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrogeologische-karte_100/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mesure état des eaux Confédération</ows:Title>
+            <ows:Abstract>La surveillance nationale continue des cours d’eau suisses (NADUF) suit l’évolution des concentrations et flux de substances dans des cours d’eau suisses sélectionnés. NADUF est, depuis 1972, un projet commun de l'OFEV et de l'Institut de recherches hydrologiques EAWAG, auxquels s'est joint en 2003 l'Institut fédéral de recherches sur la forêt, la neige et le paysage (WSL).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-daueruntersuchung_fliessgewaesser</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=89a644dc-b73d-4d01-b72e-8feefc8f4bf7"/>
+            <Style>
+                <ows:Title>Mesure état des eaux Confédération</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-daueruntersuchung_fliessgewaesser</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-daueruntersuchung_fliessgewaesser_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-daueruntersuchung_fliessgewaesser/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mesure état des eaux CH</ows:Title>
+            <ows:Abstract>Cette série de données regroupe des stations de mesure dans lesquelles est relevé l’état des eaux superficielles. Ce sont principalement les cantons qui réalisent ces investigations, puisque, comme pour d’autres domaines environnementaux, ils sont responsables de l’application de la législation en matière de protection des eaux. La Confédération se limite aux enquêtes d’intérêt national. Les données des cantons et de la Confédération sont rassemblées dans la ban [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-gewaesserzustandsmessstationen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f48022fc-52a9-4303-95c7-18f5096f1a00"/>
+            <Style>
+                <ows:Title>Mesure état des eaux CH</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-gewaesserzustandsmessstationen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-gewaesserzustandsmessstationen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130301</Default>
+                <Value>20130301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-gewaesserzustandsmessstationen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Arrière-plan hydrologique</ows:Title>
+            <ows:Abstract>Outre le contour de la Suisse, le fonds cartographique affiche un réseau hydrographique simplifié et réduit ainsi qu'une sélection de villes afin de faciliter l'orientation en vue rapprochée. La carte est utilisée sur les pages Données et bases hydrologiques du site Internet de l'OFEV (www.hydrodaten.admin.ch) afin de présenter diverses informations hydrologiques (p. ex. seuils d'alerte atteints, comparaisons de températures, etc.). L'utilisa [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-hintergrundkarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=bbc6aedb-019f-4a49-8a6c-437264b3bd37"/>
+            <Style>
+                <ows:Title>Arrière-plan hydrologique</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-hintergrundkarte</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141023</Default>
+                <Value>20141023</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_18</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-hintergrundkarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Limnimètres à maximum</ows:Title>
+            <ows:Abstract>Cette série de données regroupe les stations de mesure des crues fédérales, nommées « Hochwassergrenzwertpegel ». Elle représente l’état de l’année 2005, ce réseau n’est plus en service. Les stations étaient généralement équipées de limnimètres à maximum, sur lesquels on ne relevait que quelques fois par an le niveau maximum atteint par l’eau entre les lectures.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-hochwassergrenzwertpegel</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=36bcd44f-fd6e-49cd-a220-a6e9f386028e"/>
+            <Style>
+                <ows:Title>Limnimètres à maximum</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-hochwassergrenzwertpegel</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-hochwassergrenzwertpegel_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20050101</Default>
+                <Value>20050101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-hochwassergrenzwertpegel/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Statistiques des crues</ows:Title>
+            <ows:Abstract>L’OFEV gère les données relatives aux crues, les analyse du point de vue statistique et les met à disposition sous la forme de feuilles de résultats. Une analyse statistique systématique des données du réseau de mesure des débits sous l'angle des crues est réalisée depuis 1986. Durant de nombreuses années, la division Hydrologie s'est pour cela basée sur les recommandations « Berechnung von Hochwasserwarscheinlichkeiten » de la Deutsche Verband für Wasse [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-hochwasserstatistik</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=74936192-7935-4686-86ad-c7c795d31b44"/>
+            <Style>
+                <ows:Title>Statistiques des crues</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-hochwasserstatistik</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-hochwasserstatistik_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-hochwasserstatistik/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stations hydrométriques</ows:Title>
+            <ows:Abstract>Cette série de données regroupe les stations de mesure qui appartiennent au réseau de base de la division Hydrologie de OFEV, c'est-à-dire toutes les stations publiées sur le site Internet de l'office (état 2014). Le réseau de base compte au-jourd'hui quelque 260 stations de mesure des eaux de surface. Il permet de déterminer non seulement le niveau d'eau des lacs mais aussi le débit des cours d'eau en 200 endroits. Quelque 90 % des stations  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-hydromessstationen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=bd377507-c61d-4fe2-bf81-9605b405d8ad"/>
+            <Style>
+                <ows:Title>Stations hydrométriques</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-hydromessstationen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-hydromessstationen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141201</Default>
+                <Value>20141201</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-hydromessstationen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Statistiques des étiages</ows:Title>
+            <ows:Abstract>La description des étiages s'appuie sur un grand nombre de paramètres. Les statistiques des étiages de la division Hydrologie de l’Office fédéral de l’environnement sont basées sur les recommandations du Deutsche Verband für Wasserwirtschaft und Kulturbau (DVWK 1982/1992, aujourd’hui DWA). Elles comprennent les valeurs annuelles des débits d’étiage moyens sur un nombre x de jours (NMxQ). Les paramètres NMxQ sont intéressants pour les prises ou les restitutio [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-niedrigwasserstatistik</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5cfc8b95-c901-44b9-baa3-b768a5edb647"/>
+            <Style>
+                <ows:Title>Statistiques des étiages</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-niedrigwasserstatistik</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-niedrigwasserstatistik_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130101</Default>
+                <Value>20130101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-niedrigwasserstatistik/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Eléments pour déterminer Q347</ows:Title>
+            <ows:Abstract>Quiconque opère un prélèvement dans un cours d'eau à débit permanent (dans lequel de l'eau s'écoule toute l'année) - que ce soit pour la production d'énergie électrique, pour l'irrigation ou pour le refroidissement - a besoin d'une autorisation. Cette autorisation n'est délivrée que si un débit résiduel convenable est maintenu dans la rivière ou dans le ruisseau. Les prescriptions garantissant des débits résiduels convenables selo [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-q347</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=83e6752a-e668-4ade-9ad5-fd9d555d35da"/>
+            <Style>
+                <ows:Title>Eléments pour déterminer Q347</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-q347</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-q347_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130101</Default>
+                <Value>20130101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-q347/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>HUG Bassins recherches hydro.</ows:Title>
+            <ows:Abstract>Depuis 1957, la division Hydrologie de l'OFEV exploite un réseau de mesure des bassins de recherches hydrologiques dans le but d’observer les changements à long terme du régime hydrologique dans des bassins versants naturels de différentes zones climatiques de Suisse. Il dispose ainsi, pour près de 40 bassins versants, de la lame d'eau écoulée et il calcule pour la plupart de ces territoires les précipitations surfaciques mensuelles ou annuelles, ainsi q [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-untersuchungsgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=eb6b589d-1184-441f-84cf-d4fa6ac46a38"/>
+            <Style>
+                <ows:Title>HUG Bassins recherches hydro.</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-untersuchungsgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-untersuchungsgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160111</Default>
+                <Value>20160111</Value>
+                <Value>20130101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-untersuchungsgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>HUG / stations de mesure</ows:Title>
+            <ows:Abstract>Depuis 1957, la division Hydrologie de l'OFEV exploite un réseau de mesure des bassins de recherches hydrologiques dans le but d’observer les changements à long terme du régime hydrologique dans des bassins versants naturels de différentes zones climatiques de Suisse. Il dispose ainsi, pour près de 40 bassins versants, de la lame d'eau écoulée et il calcule pour la plupart de ces territoires les précipitations surfaciques mensuelles ou annuelles, ainsi q [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-untersuchungsgebiete_stationen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9ce0ce29-35b2-4fdd-bfc8-247e189dca8f"/>
+            <Style>
+                <ows:Title>HUG / stations de mesure</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-untersuchungsgebiete_stationen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-untersuchungsgebiete_stationen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130101</Default>
+                <Value>20130101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-untersuchungsgebiete_stationen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stations de mesure Température eau</ows:Title>
+            <ows:Abstract>Cette série de données regroupe toutes les stations de mesure de la division Hydrologie de l’Office fédéral de l’environnement (OFEV) où la température de l’eau fait actuellement l’objet d’un relevé (état 2014). Le réseau ne comprend que des stations situées sur des cours d’eau.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologie-wassertemperaturmessstationen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4f10c35a-8fac-4000-ab6d-7a294284059a"/>
+            <Style>
+                <ows:Title>Stations de mesure Température eau</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologie-wassertemperaturmessstationen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologie-wassertemperaturmessstationen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141201</Default>
+                <Value>20141201</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologie-wassertemperaturmessstationen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassin de base</ows:Title>
+            <ows:Abstract>Les bassins de bases constituent la couche inférieure du système pour la description de la répartition des bassins hydrologiques Suisse (Atlas Hydrologique de la Suisse AHDES). Sur cette couche, en fonction de leurs caractéristiques spatiales naturelles, sont reportés les bassins versants (30-50 km2) les plus homogènes possibles.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologischer-atlas_basisgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f9e7ce17-3622-4ae4-8cbb-067011d5eed5"/>
+            <Style>
+                <ows:Title>Bassin de base</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologischer-atlas_basisgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologischer-atlas_basisgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologischer-atlas_basisgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassin de bilan</ows:Title>
+            <ows:Abstract>Les bassins de bilan constituent la couche moyenne du système des bassins versants pour la description de la répartition hydrographique de la Suisse (Atlas Hydrologique de la Suisse HADES)Ils sont en règle générale d’une grandeur comprise entre 100 et 200 km2.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologischer-atlas_bilanzgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=52d0c066-65dd-4dd1-ac94-2b34f83a9bd6"/>
+            <Style>
+                <ows:Title>Bassin de bilan</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologischer-atlas_bilanzgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologischer-atlas_bilanzgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologischer-atlas_bilanzgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassin fluvial</ows:Title>
+            <ows:Abstract>Les bassins fluviaux constituent la couche supérieure du système des bassins versants pour la description de la répartition hydrographique de la Suisse (Atlas Hydrologique de la Suisse AHDES)Les grands bassins versants avec une surface de plusieurs milliers de km2 sont drainés par de grands cours d’eau : Rhin, Aar, Reuss, Limmat, Thur, Rhône, Ticino, Inn, Adda et Adige.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.hydrologischer-atlas_flussgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=edff6d33-ba8c-441e-b8bd-7ab4969d4440"/>
+            <Style>
+                <ows:Title>Bassin fluvial</ows:Title>
+                <ows:Identifier>ch.bafu.hydrologischer-atlas_flussgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.hydrologischer-atlas_flussgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.hydrologischer-atlas_flussgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Nappes d'eau souterraine karstiques</ows:Title>
+            <ows:Abstract>La couche Nappes d'eau souterraines karstiques représente la projection à la surface de l'extension de la zone saturée dans les aquifères karstiques. Cette dernière est déterminée par le niveau piézométrique karstique et donc par l'altitude de l'exutoire principal (source) de chaque système karstique. Les informations présentées dans les catégories Régions karstiques et Eaux souterraines karstiques sont déduites des modèles hydrogéologiques 3D (a [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.karst-ausdehnung_grundwasservorkommen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4ea295bb-a098-492b-84f8-e7687737fb35"/>
+            <Style>
+                <ows:Title>Nappes d'eau souterraine karstiques</ows:Title>
+                <ows:Identifier>ch.bafu.karst-ausdehnung_grundwasservorkommen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.karst-ausdehnung_grundwasservorkommen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160301</Default>
+                <Value>20160301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.karst-ausdehnung_grundwasservorkommen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassins d'alimentation karstiques</ows:Title>
+            <ows:Abstract>La couche Bassins d'alimentation karstiques représente la surface pour laquelle la recharge rejoint une certaine source. Il arrive que les bassins d'alimentation se superposent, une partie des eaux d'infiltration alimentant ainsi plusieurs sources (zone de diffluence). Les bassins d'alimentation karstiques sont reliés aux sources karstiques: si un bassin d'alimentation est sélectionné, les sources karstiques y étant rattachées le seront égale [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.karst-einzugsgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=01811bd5-7f55-4c89-92f2-78fcd379affa"/>
+            <Style>
+                <ows:Title>Bassins d'alimentation karstiques</ows:Title>
+                <ows:Identifier>ch.bafu.karst-einzugsgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.karst-einzugsgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160301</Default>
+                <Value>20160301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.karst-einzugsgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Unités de bassin karstique</ows:Title>
+            <ows:Abstract>La couche Unités de bassin karstique est constituée des surfaces pour lesquelles un écoulement similaire des eaux souterraines de la zone de recharge à la source karstique est attendu. Ceci tient notamment compte d'un phénomène typique des régions karstiques qui permet, selon les conditions hydrologiques, qu'une partie du bassin d'alimentation soit drainée vers plusieurs directions et alimente ainsi différents systèmes karstiques et les sources respe [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.karst-einzugsgebietseinheiten</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fa918831-97d1-4486-a348-c891f4e900ad"/>
+            <Style>
+                <ows:Title>Unités de bassin karstique</ows:Title>
+                <ows:Identifier>ch.bafu.karst-einzugsgebietseinheiten</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.karst-einzugsgebietseinheiten_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160301</Default>
+                <Value>20160301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.karst-einzugsgebietseinheiten/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sources karstiques et pertes</ows:Title>
+            <ows:Abstract>La couche Sources karstiques et pertes représente les exutoires principaux des eaux souterraines dans un système karstique ainsi que des infiltrations ponctuelles majeures. Une distinction est faite entre les sources captées et non-captées ainsi qu'entre les sources temporaires et pérennes. Les sources karstiques sont reliées aux bassins d'alimentation karstiques: en sélectionnant une source, son bassin d'alimentation sera indiqué. Les informations p [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.karst-quellen_schwinden</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1786c0cc-8aac-44b1-880c-aa627de09c1e"/>
+            <Style>
+                <ows:Title>Sources karstiques et pertes</ows:Title>
+                <ows:Identifier>ch.bafu.karst-quellen_schwinden</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.karst-quellen_schwinden_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160301</Default>
+                <Value>20160301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.karst-quellen_schwinden/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ecoulements souterrains</ows:Title>
+            <ows:Abstract>La couche Ecoulement souterrains montre le cheminement probable des eaux souterraines entre un bassin d'alimentation karstique et sa source. L'interprétation se base également sur les résultats d'essais de traçage, ces derniers prouvant les liens préalablement supposés. Les informations présentées dans les catégories Régions karstiques et Eaux souterraines karstiques sont déduites des modèles hydrogéologiques 3D (approche KARSYS). Elles ont été établ [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.karst-unterirdische_fliesswege</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7db32f1d-691d-4d2d-a842-ee188210acf6"/>
+            <Style>
+                <ows:Title>Ecoulements souterrains</ows:Title>
+                <ows:Identifier>ch.bafu.karst-unterirdische_fliesswege</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.karst-unterirdische_fliesswege_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160301</Default>
+                <Value>20160301</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.karst-unterirdische_fliesswege/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bruit ferroviaire nuit</ows:Title>
+            <ows:Abstract>La carte montre l'exposition de la population au bruit ferroviaire pendant la nuit. Les indications s'appuient sur une modélisation effectuée à l'échelle nationale. Le nouveau calcul de bruit ferroviaire est basé sur les données de trafic de l'année 2011. Un réseau d'environ 3000 km a été considéré pour les calculs. Ces données n'ont pas force de loi. Les charges sonores et données d'assainissement officielles sont fournies par l' [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.laerm-bahnlaerm_nacht</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=93814e81-2466-4690-b54d-c1d958f1c3b8"/>
+            <Style>
+                <ows:Title>Bruit ferroviaire nuit</ows:Title>
+                <ows:Identifier>ch.bafu.laerm-bahnlaerm_nacht</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.laerm-bahnlaerm_nacht_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20111231</Default>
+                <Value>20111231</Value>
+                <Value>20061231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.laerm-bahnlaerm_nacht/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bruit ferroviaire jour</ows:Title>
+            <ows:Abstract>La carte montre l'exposition de la population au bruit ferroviaire diurne. Les indications s'appuient sur une modélisation effectuée à l'échelle nationale. Le nouveau calcul de bruit ferroviaire est basé sur les données du trafic de l'année 2011. Un réseau d'environ 3000 km a été considéré pour les calculs. Ces données n'ont pas force de loi. Les charges sonores et données d'assainissement officielles sont fournies par l'autorité  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.laerm-bahnlaerm_tag</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c335f61e-1e94-4a59-b0e7-94bb158f5a48"/>
+            <Style>
+                <ows:Title>Bruit ferroviaire jour</ows:Title>
+                <ows:Identifier>ch.bafu.laerm-bahnlaerm_tag</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.laerm-bahnlaerm_tag_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20111231</Default>
+                <Value>20111231</Value>
+                <Value>20061231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.laerm-bahnlaerm_tag/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bruit du trafic routier nuit</ows:Title>
+            <ows:Abstract>La carte montre l'exposition de la population au bruit de la circulation routière pendant la nuit. Les indications s'appuient sur une modélisation effectuée à l'échelle nationale utilisant le modèle sonBASE. Elles ont été obtenues à partir des données d'environ 72'000 km de routes. Les calculs actualisés pour 2014 montrent que pendant la nuit une personne sur six est exposée à un bruit routier nuisible ou incommodant. Les données ne sont pas  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.laerm-strassenlaerm_nacht</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=89a0b0bc-10ff-4e3e-a4e4-36d081e2e672"/>
+            <Style>
+                <ows:Title>Bruit du trafic routier nuit</ows:Title>
+                <ows:Identifier>ch.bafu.laerm-strassenlaerm_nacht</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.laerm-strassenlaerm_nacht_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20101231</Default>
+                <Value>20101231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.laerm-strassenlaerm_nacht/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bruit du trafic routier jour</ows:Title>
+            <ows:Abstract>La carte montre l'exposition de la population au bruit de la circulation routière pendant le jour. Les indications s'appuient sur une modélisation effectuée à l'échelle nationale utilisant le modèle sonBASE. Elles ont été obtenues à partir des données d'environ 72'000 km de routes. Les calculs actualisés pour 2014 montrent que pendant le jour, une personne sur cinq est exposée à un bruit routier nuisible ou incommodant. Les données ne sont pa [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.laerm-strassenlaerm_tag</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=87f3f029-4685-4d51-9de2-2a409b32aff5"/>
+            <Style>
+                <ows:Title>Bruit du trafic routier jour</ows:Title>
+                <ows:Identifier>ch.bafu.laerm-strassenlaerm_tag</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.laerm-strassenlaerm_tag_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20101231</Default>
+                <Value>20101231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.laerm-strassenlaerm_tag/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liste rouge mousses</ows:Title>
+            <ows:Abstract>La carte montre toutes les stations de Suisse où ont été identifiées des mousses appartenant à des espèces menacées et protégées. Il s’agit de celles inscrites sur la liste rouge dans les catégories CR (en danger critique d’extinction), EN (en danger), VU (vulnérable) et RE (éteint en Suisse) et de toutes celles protégées au niveau national ou cantonal par l’ordonnance sur la protection de la nature et du paysage (OPN). Un point sur la carte correspond soit à l’ [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.moose</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=07b046a7-1b21-4cd0-b605-a113f2e5e94d"/>
+            <Style>
+                <ows:Title>Liste rouge mousses</ows:Title>
+                <ows:Identifier>ch.bafu.moose</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.moose_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120416</Default>
+                <Value>20120416</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.moose/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stations de mesure qualité de l'air</ows:Title>
+            <ows:Abstract>Le réseau national d'observation des polluants atmosphériques NABEL mesure la pollution de l'air en Suisse en 16 emplacements. Les stations sont réparties sur l'ensemble du territoire et elles mesurent la charge en des endroits caractéristiques (p. ex. routes du centre-ville, zones d'habitation, stations rurales).Les stations du réseau NABEL reflètent différentes situations de pollution selon le type d'emplacement. La qualité de l'air doi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.nabelstationen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=14de1375-09ae-42b4-9592-5f0af091d050"/>
+            <Style>
+                <ows:Title>Stations de mesure qualité de l'air</ows:Title>
+                <ows:Identifier>ch.bafu.nabelstationen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.nabelstationen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110309</Default>
+                <Value>20110309</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.nabelstationen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Chèvrefeuille du Japon</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-japanisches_geissblatt</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a5bd8033-8457-486b-b099-2e6f3f7864a8"/>
+            <Style>
+                <ows:Title>Chèvrefeuille du Japon</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-japanisches_geissblatt</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-japanisches_geissblatt_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140825</Default>
+                <Value>20140825</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-japanisches_geissblatt/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Berce du Caucase</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-riesenbaerenklau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=98b43c26-0f11-4c58-af85-b007712b17b0"/>
+            <Style>
+                <ows:Title>Berce du Caucase</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-riesenbaerenklau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-riesenbaerenklau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140825</Default>
+                <Value>20140825</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-riesenbaerenklau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Renouée de Sakhaline</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-sachalin_staudenknoeterich</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ae7db8c9-3bb8-43ca-a5d1-99de05cd8d32"/>
+            <Style>
+                <ows:Title>Renouée de Sakhaline</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-sachalin_staudenknoeterich</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-sachalin_staudenknoeterich_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-sachalin_staudenknoeterich/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Buddléia de David</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-schmetterlingsstrauch</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b0658eec-d604-4490-910c-e7117c0444bb"/>
+            <Style>
+                <ows:Title>Buddléia de David</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-schmetterlingsstrauch</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-schmetterlingsstrauch_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-schmetterlingsstrauch/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Cornouiller soyeux</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-seidiger_hornstrauch</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=93c4e4a5-dc4d-40bc-9a79-728f133abcbb"/>
+            <Style>
+                <ows:Title>Cornouiller soyeux</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-seidiger_hornstrauch</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-seidiger_hornstrauch_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-seidiger_hornstrauch/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Solidage géant</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-spaetbluehende_goldrute</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=407f5593-f5a3-497d-a5fa-97354027085c"/>
+            <Style>
+                <ows:Title>Solidage géant</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-spaetbluehende_goldrute</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-spaetbluehende_goldrute_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-spaetbluehende_goldrute/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Séneçon sud-africain</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-suedafrikanisches_greiskraut</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a7579e76-c854-431b-ab03-6e773c2da82e"/>
+            <Style>
+                <ows:Title>Séneçon sud-africain</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-suedafrikanisches_greiskraut</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-suedafrikanisches_greiskraut_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-suedafrikanisches_greiskraut/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Asclépiade de Syrie</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-syrische_seidenpflanze</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c0858914-d721-42a3-b856-a3b786d99762"/>
+            <Style>
+                <ows:Title>Asclépiade de Syrie</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-syrische_seidenpflanze</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-syrische_seidenpflanze_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-syrische_seidenpflanze/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Topinambour</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-topinambur</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=3d459271-5d29-4454-b416-3cdcc15bff7f"/>
+            <Style>
+                <ows:Title>Topinambour</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-topinambur</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-topinambur_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-topinambur/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Armoise des frères Verlot</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-verlotscher_beifuss</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9c64b6c9-57a6-4da6-b46c-df7f5fb4706e"/>
+            <Style>
+                <ows:Title>Armoise des frères Verlot</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-verlotscher_beifuss</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-verlotscher_beifuss_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-verlotscher_beifuss/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Renouée à épis nombreux</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-vielaehriger_knoeterich</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e125626e-bd88-4401-94f7-b41f7f09b835"/>
+            <Style>
+                <ows:Title>Renouée à épis nombreux</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-vielaehriger_knoeterich</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-vielaehriger_knoeterich_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-vielaehriger_knoeterich/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Lupin à folioles nombreuses</ows:Title>
+            <ows:Abstract>Le set « plantes exotiques envahissantes » contient les cartes de distribution potentielle pour 56 plantes exotiques envahissantes en Suisse et répertoriées dans la Liste Noire et la Watch-List, ou présentes dans les pays voisins et ayant le potentiel de coloniser la Suisse. Les cartes sont le résultat de modélisation de l'Université de Lausanne et prédisent leur potentiel de propagation de ces espèces en Suisse. Les modèles sont basés respectivement sur les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.neophyten-vielblaettrige_lupine</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e3af5881-4a91-42aa-bec8-ba759279f3f1"/>
+            <Style>
+                <ows:Title>Lupin à folioles nombreuses</ows:Title>
+                <ows:Identifier>ch.bafu.neophyten-vielblaettrige_lupine</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.neophyten-vielblaettrige_lupine_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20151007</Default>
+                <Value>20151007</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.neophyten-vielblaettrige_lupine/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ecomorphologie R - Tronçons</ows:Title>
+            <ows:Abstract>Il est nécessaire de connaître l’état des cours d’eau pour en assurer une protection globale. Les données requises peuvent être obtenues grâce au système modulaire gradué, qui définit le cadre d’une analyse et d’une appréciation standardisées des cours d’eau. Ce système comprend les modules suivants: hydrologie, structure des cours d’eau (écomorphologie), chimie des eaux, écotoxicologie et biocénose animales, végétales et microorganismes (biologie).Le module Eco [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.oekomorphologie-f_abschnitte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ea12e280-75cf-4b71-90f0-d2bcc9d7fdfa"/>
+            <Style>
+                <ows:Title>Ecomorphologie R - Tronçons</ows:Title>
+                <ows:Identifier>ch.bafu.oekomorphologie-f_abschnitte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.oekomorphologie-f_abschnitte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20080913</Default>
+                <Value>20080913</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.oekomorphologie-f_abschnitte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ecomorphologie R - Seuils</ows:Title>
+            <ows:Abstract>Il est nécessaire de connaître l’état des cours d’eau pour en assurer une protection globale. Les données requises peuvent être obtenues grâce au système modulaire gradué, qui définit le cadre d’une analyse et d’une appréciation standardisées des cours d’eau. Ce système comprend les modules suivants: hydrologie, structure des cours d’eau (écomorphologie), chimie des eaux, écotoxicologie et biocénose animales, végétales et microorganismes (biologie).Le module Eco [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.oekomorphologie-f_abstuerze</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1ec44d95-573a-489c-9a57-7bc278cc6792"/>
+            <Style>
+                <ows:Title>Ecomorphologie R - Seuils</ows:Title>
+                <ows:Identifier>ch.bafu.oekomorphologie-f_abstuerze</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.oekomorphologie-f_abstuerze_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110912</Default>
+                <Value>20110912</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.oekomorphologie-f_abstuerze/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ecomorphologie R – Ouvrages</ows:Title>
+            <ows:Abstract>Il est nécessaire de connaître l’état des cours d’eau pour en assurer une protection globale. Les données requises peuvent être obtenues grâce au système modulaire gradué, qui définit le cadre d’une analyse et d’une appréciation standardisées des cours d’eau. Ce système comprend les modules suivants: hydrologie, structure des cours d’eau (écomorphologie), chimie des eaux, écotoxicologie et biocénose animales, végétales et microorganismes (biologie).Le module Eco [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.oekomorphologie-f_bauwerke</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5742b03b-d567-4acb-a84d-a3069faaa396"/>
+            <Style>
+                <ows:Title>Ecomorphologie R – Ouvrages</ows:Title>
+                <ows:Identifier>ch.bafu.oekomorphologie-f_bauwerke</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.oekomorphologie-f_bauwerke_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110912</Default>
+                <Value>20110912</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.oekomorphologie-f_bauwerke/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte indicative du Pergélisol</ows:Title>
+            <ows:Abstract>En Suisse, au-dessus de 2400 mètres d'altitude et en fonction de l'orientation géographique, le sol peut être gelé en permanence. Ce phénomène est appelé « pergélisol » ou « permafrost ». Les changements climatiques risquent de remonter l'altitude minimale du pergélisol au cours des prochaines décennies, ce qui peut déclencher des chutes de pierres, des éboulements, des glissements de terrain et des laves torrentielles dans les régions de montagne.La [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.permafrost</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=71d087ef-6531-4131-98ea-88ff655d8a63"/>
+            <Style>
+                <ows:Title>Carte indicative du Pergélisol</ows:Title>
+                <ows:Identifier>ch.bafu.permafrost</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.permafrost_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110317</Default>
+                <Value>20110317</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.permafrost/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>REN  Zones agricoles extensives</ows:Title>
+            <ows:Abstract>Le Réseau écologique national (REN) a été élaboré en étroite collaboration avec les services cantonaux de la nature et du paysage. Il s’agit d’un rapport technique et scientifique qui présente le paysage suisse sous l’angle écologique. Il expose le mitage et la connectivité des milieux sur des cartes aux échelles 1:500 000 et 1:100 000. Il n’examine pas uniquement la situation actuelle, mais tient compte également du potentiel du paysage. Cette vision globale ax [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.ren-extensive_landwirtschaftsgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d60ff6a8-4b80-4535-aa89-cfad26916b80"/>
+            <Style>
+                <ows:Title>REN  Zones agricoles extensives</ows:Title>
+                <ows:Identifier>ch.bafu.ren-extensive_landwirtschaftsgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.ren-extensive_landwirtschaftsgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110214</Default>
+                <Value>20110214</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.ren-extensive_landwirtschaftsgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>REN  Zones humides</ows:Title>
+            <ows:Abstract>Le Réseau écologique national (REN) a été élaboré en étroite collaboration avec les services cantonaux de la nature et du paysage. Il s’agit d’un rapport technique et scientifique qui présente le paysage suisse sous l’angle écologique. Il expose le mitage et la connectivité des milieux sur des cartes aux échelles 1:500 000 et 1:100 000. Il n’examine pas uniquement la situation actuelle, mais tient compte également du potentiel du paysage. Cette vision globale ax [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.ren-feuchtgebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8bc1565a-023e-490c-9526-fa04a14169ab"/>
+            <Style>
+                <ows:Title>REN  Zones humides</ows:Title>
+                <ows:Identifier>ch.bafu.ren-feuchtgebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.ren-feuchtgebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110214</Default>
+                <Value>20110214</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.ren-feuchtgebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>REN  Zones aquatiques</ows:Title>
+            <ows:Abstract>Le Réseau écologique national (REN) a été élaboré en étroite collaboration avec les services cantonaux de la nature et du paysage. Il s’agit d’un rapport technique et scientifique qui présente le paysage suisse sous l’angle écologique. Il expose le mitage et la connectivité des milieux sur des cartes aux échelles 1:500 000 et 1:100 000. Il n’examine pas uniquement la situation actuelle, mais tient compte également du potentiel du paysage. Cette vision globale ax [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.ren-fliessgewaesser_seen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=32dfd304-28de-4e82-ad8d-8d6cb6b5fe83"/>
+            <Style>
+                <ows:Title>REN  Zones aquatiques</ows:Title>
+                <ows:Identifier>ch.bafu.ren-fliessgewaesser_seen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.ren-fliessgewaesser_seen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110214</Default>
+                <Value>20110214</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.ren-fliessgewaesser_seen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>REN  Zones de prairies sèches</ows:Title>
+            <ows:Abstract>Le Réseau écologique national (REN) a été élaboré en étroite collaboration avec les services cantonaux de la nature et du paysage. Il s’agit d’un rapport technique et scientifique qui présente le paysage suisse sous l’angle écologique. Il expose le mitage et la connectivité des milieux sur des cartes aux échelles 1:500 000 et 1:100 000. Il n’examine pas uniquement la situation actuelle, mais tient compte également du potentiel du paysage. Cette vision globale ax [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.ren-trockenstandorte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b5f7374b-2f4b-4d28-a23c-eb2d2a64b579"/>
+            <Style>
+                <ows:Title>REN  Zones de prairies sèches</ows:Title>
+                <ows:Identifier>ch.bafu.ren-trockenstandorte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.ren-trockenstandorte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110214</Default>
+                <Value>20110214</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.ren-trockenstandorte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>REN Zones forêts</ows:Title>
+            <ows:Abstract>Le Réseau écologique national (REN) a été élaboré en étroite collaboration avec les services cantonaux de la nature et du paysage. Il s’agit d’un rapport technique et scientifique qui présente le paysage suisse sous l’angle écologique. Il expose le mitage et la connectivité des milieux sur des cartes aux échelles 1:500 000 et 1:100 000. Il n’examine pas uniquement la situation actuelle, mais tient compte également du potentiel du paysage. Cette vision globale ax [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.ren-wald</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a193df6d-071c-4a1d-bb64-0921cc916f2f"/>
+            <Style>
+                <ows:Title>REN Zones forêts</ows:Title>
+                <ows:Identifier>ch.bafu.ren-wald</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.ren-wald_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110214</Default>
+                <Value>20110214</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.ren-wald/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Parcs suisses (Zones)</ows:Title>
+            <ows:Abstract>Le fichier Parcs contient le Parc national suisse qui est une aire protégée par la loi du 19 décembre 1980 sur le Parc national (RS 454) et les projets de parc déposés à l'OFEV. Ces projets de parc déposés à l'OFEV sont régis par la loi sur la protection de la nature et du paysage révisée le 1er décembre 2007 (RS 451). Cette loi définit trois catégories de parcs nationaux: les parcs nationaux, les parcs naturels régionaux et les parcs naturels périurbain [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b1fb8e29-8387-4081-9976-022ff925823b"/>
+            <Style>
+                <ows:Title>Parcs suisses (Zones)</ows:Title>
+                <ows:Identifier>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.schutzgebiete-paerke_nationaler_bedeutung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Parcs suisses (Perimetre)</ows:Title>
+            <ows:Abstract>Le fichier Parcs contient le Parc national suisse qui est une aire protégée par la loi du 19 décembre 1980 sur le Parc national (RS 454) et les projets de parc déposés à l'OFEV. Ces projets de parc déposés à l'OFEV sont régis par la loi sur la protection de la nature et du paysage révisée le 1er décembre 2007 (RS 451). Cette loi définit trois catégories de parcs nationaux: les parcs nationaux, les parcs naturels régionaux et les parcs naturels périurbain [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_perimeter</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=bc4bd921-cec6-4f29-a784-29049c9f8026"/>
+            <Style>
+                <ows:Title>Parcs suisses (Perimetre)</ows:Title>
+                <ows:Identifier>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_perimeter</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_perimeter_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_perimeter/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Ramsar</ows:Title>
+            <ows:Abstract>Pour protéger les zones humides, particulièrement comme habitats de la sauvagine, une convention d’importance internationale a été signée dans la ville iranienne de Ramsar en 1971. En ratifiant la Convention de Ramsar en 1976, la Suisse s’est engagée à garantir l’exploitation durable des zones humides et à leur accorder une protection spéciale. Jusqu’à présent, elle a annoncé onze zones en quatre étapes à la Convention de Ramsar; l’objet n° 6 a été élargi en l’a [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.schutzgebiete-ramsar</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d960a5c8-44e4-4d10-a9f6-95f58568563c"/>
+            <Style>
+                <ows:Title>Ramsar</ows:Title>
+                <ows:Identifier>ch.bafu.schutzgebiete-ramsar</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.schutzgebiete-ramsar_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110830</Default>
+                <Value>20110830</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.schutzgebiete-ramsar/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Parc national</ows:Title>
+            <ows:Abstract>Le Parc national a été créé en 1909 sur la base d’initiatives privées. La création officielle remonte au 1er août 1914 avec la cession à la Confédération. Le territoire du parc a été élargi à plusieurs reprises entre 1918 et 2000. Le tracé exact des limites du Parc national est défini dans les contrats conclus entre les communes et la Confédération helvétique. L’organe responsable du parc est la fondation de droit public « Parc national suisse » sise à Berne.</o [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.schutzgebiete-schweizerischer_nationalpark</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d1359dad-6edf-4275-ada0-2e33be8945b2"/>
+            <Style>
+                <ows:Title>Parc national</ows:Title>
+                <ows:Identifier>ch.bafu.schutzgebiete-schweizerischer_nationalpark</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.schutzgebiete-schweizerischer_nationalpark_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20010117</Default>
+                <Value>20010117</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.schutzgebiete-schweizerischer_nationalpark/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe communes: crues</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-gemeinden_hochwasser</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=26456ca7-828c-435a-8411-360433268599"/>
+            <Style>
+                <ows:Title>ShowMe communes: crues</ows:Title>
+                <ows:Identifier>ch.bafu.showme-gemeinden_hochwasser</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-gemeinden_hochwasser_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-gemeinden_hochwasser/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe communes: avalanches</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-gemeinden_lawinen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=59d8e986-6d18-4f1e-aab8-07c3964b93ca"/>
+            <Style>
+                <ows:Title>ShowMe communes: avalanches</ows:Title>
+                <ows:Identifier>ch.bafu.showme-gemeinden_lawinen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-gemeinden_lawinen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-gemeinden_lawinen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe communes: glissements</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-gemeinden_rutschungen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7e1a39c8-69ad-4956-9a7b-57e357299fa4"/>
+            <Style>
+                <ows:Title>ShowMe communes: glissements</ows:Title>
+                <ows:Identifier>ch.bafu.showme-gemeinden_rutschungen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-gemeinden_rutschungen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-gemeinden_rutschungen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe communes: processus de chute</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-gemeinden_sturzprozesse</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b43f69ba-4b97-40e0-989f-116e5735145a"/>
+            <Style>
+                <ows:Title>ShowMe communes: processus de chute</ows:Title>
+                <ows:Identifier>ch.bafu.showme-gemeinden_sturzprozesse</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-gemeinden_sturzprozesse_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-gemeinden_sturzprozesse/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe cantons: crues</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-kantone_hochwasser</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=69a1bf2e-e07b-46f6-bdb7-a11a1f87c00a"/>
+            <Style>
+                <ows:Title>ShowMe cantons: crues</ows:Title>
+                <ows:Identifier>ch.bafu.showme-kantone_hochwasser</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-kantone_hochwasser_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-kantone_hochwasser/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe cantons: avalanches</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-kantone_lawinen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5e412b36-88c4-4996-b69d-7064f1df3c18"/>
+            <Style>
+                <ows:Title>ShowMe cantons: avalanches</ows:Title>
+                <ows:Identifier>ch.bafu.showme-kantone_lawinen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-kantone_lawinen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-kantone_lawinen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe cantons: glissements</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-kantone_rutschungen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a327b175-7788-4569-946d-a9d1737e7092"/>
+            <Style>
+                <ows:Title>ShowMe cantons: glissements</ows:Title>
+                <ows:Identifier>ch.bafu.showme-kantone_rutschungen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-kantone_rutschungen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-kantone_rutschungen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>ShowMe cantons : processus de chute</ows:Title>
+            <ows:Abstract>Les cartes des dangers mettent en évidence les espaces urbains menacés par des crues, des avalanches, des glissements de terrain ou des processus de chute. Actuellement, les cartes des dangers reprennent 99% de la superficie de la Suisse à traiter en matière d'avalanches, 97% pour les crues, 91% pour les processus de chute et 90% pour les glissements de terrain. La Confédération aide les cantons à élaborer et mettre à jour les cartes des dangers. La carte do [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.showme-kantone_sturzprozesse</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fea64430-554d-4c54-bd5d-2ee8c745d814"/>
+            <Style>
+                <ows:Title>ShowMe cantons : processus de chute</ows:Title>
+                <ows:Identifier>ch.bafu.showme-kantone_sturzprozesse</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.showme-kantone_sturzprozesse_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.showme-kantone_sturzprozesse/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes rafales 100</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-boeenspitzen_100</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4d1d17aa-2b92-42a9-b847-d6597631a264"/>
+            <Style>
+                <ows:Title>Tempêtes rafales 100</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-boeenspitzen_100</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-boeenspitzen_100_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-boeenspitzen_100/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes rafales 30</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-boeenspitzen_30</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=83d7e62e-2e5e-4877-8434-93f0cabc6438"/>
+            <Style>
+                <ows:Title>Tempêtes rafales 30</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-boeenspitzen_30</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-boeenspitzen_30_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-boeenspitzen_30/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes rafales 300</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-boeenspitzen_300</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a7956843-bc72-4271-b238-72fb4a21baa0"/>
+            <Style>
+                <ows:Title>Tempêtes rafales 300</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-boeenspitzen_300</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-boeenspitzen_300_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-boeenspitzen_300/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes rafales 50</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-boeenspitzen_50</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=17531a73-040c-4bd8-8d77-3f24c733b37a"/>
+            <Style>
+                <ows:Title>Tempêtes rafales 50</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-boeenspitzen_50</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-boeenspitzen_50_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-boeenspitzen_50/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes pression dynamique 100</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-staudruck_100</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4200db1b-16dd-48bb-8378-75afe4ec002b"/>
+            <Style>
+                <ows:Title>Tempêtes pression dynamique 100</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-staudruck_100</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-staudruck_100_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-staudruck_100/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes pression dynamique 30</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-staudruck_30</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=6edc63b6-f56b-4fb6-8ba3-1506bea16ec8"/>
+            <Style>
+                <ows:Title>Tempêtes pression dynamique 30</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-staudruck_30</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-staudruck_30_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-staudruck_30/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes pression dynamique 300</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-staudruck_300</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d416fce6-2319-4afc-9d28-3455083b2f40"/>
+            <Style>
+                <ows:Title>Tempêtes pression dynamique 300</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-staudruck_300</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-staudruck_300_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-staudruck_300/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tempêtes pression dynamique 50</ows:Title>
+            <ows:Abstract>Les cartes des dangers relatifs aux tempêtes montrent les pointes des rafales ainsi que leurs pressions dynamiques avec leurs marges d’erreurs. Elles fournissent une base qui permet d’évaluer le danger régional. À ce titre, la référence concernant les pressions dynamiques (norme SIA 261 annexe E) n’est pas remplacée. Le danger de tempête est calculé sur la base de 83 périodes de tempêtes hivernales, enregistrées de 1871 à 2011, ainsi que de l’ensemble des donnée [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.sturm-staudruck_50</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=41ace4c6-967d-4b99-b7aa-a0e51bc63611"/>
+            <Style>
+                <ows:Title>Tempêtes pression dynamique 50</ows:Title>
+                <ows:Identifier>ch.bafu.sturm-staudruck_50</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.sturm-staudruck_50_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141107</Default>
+                <Value>20141107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.sturm-staudruck_50/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Rejets de polluants (SwissPRTR)</ows:Title>
+            <ows:Abstract>SwissPRTR (Swiss Pollutant Release and Transfer Register) est le Registre suisse des rejets et transferts de polluants. Il est accessible au public et fournit des informations sur les rejets de polluants, les transferts de déchets et les transferts de polluants dans les eaux usées, provenant tant d'entreprises que de sources diffuses.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.swissprtr</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=980b541f-f651-439b-ad0c-ec0f7f10e514"/>
+            <Style>
+                <ows:Title>Rejets de polluants (SwissPRTR)</ows:Title>
+                <ows:Identifier>ch.bafu.swissprtr</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.swissprtr_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150226</Default>
+                <Value>20150226</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.swissprtr/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>UNESCO sites naturels</ows:Title>
+            <ows:Abstract>La Convention pour la protection du patrimoine mondial culturel et naturel (RS 0.451.41) a été conclue par la Conférence générale de l’UNESCO en 1972. Elle vise à conserver les biens culturels et naturels qui ont une valeur universelle exceptionnelle en tant que partie du patrimoine de l’humanité. Les Etats signataires s’engagent à protéger et à conserver les objets situés sur leur territoire. La Suisse a proposé jusqu’à présent huit sites culturels et trois sit [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.unesco-weltnaturerbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4a571da5-c3af-47fe-99a1-f33fc29d1cd9"/>
+            <Style>
+                <ows:Title>UNESCO sites naturels</ows:Title>
+                <ows:Identifier>ch.bafu.unesco-weltnaturerbe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.unesco-weltnaturerbe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20080724</Default>
+                <Value>20080724</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.unesco-weltnaturerbe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réserves forestières</ows:Title>
+            <ows:Abstract>Les réserves forestières sont des surfaces protégées durablement et vouées à la diversité écologique et biologique en forêt. Elles permettent d'une part le développement naturel complet de l'écosystème forestier dans le temps et dans l'espace (protection des processus dans les réserves forestières dites naturelles). D'autre part, elles servent à maintenir des milieux naturels (habitats) particuliers pour certaines espèces et bénéficient en ce cas [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.waldreservate</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4b9ff750-3e52-43e9-80d1-c07c59c469fd"/>
+            <Style>
+                <ows:Title>Réserves forestières</ows:Title>
+                <ows:Identifier>ch.bafu.waldreservate</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.waldreservate_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150622</Default>
+                <Value>20150622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.waldreservate/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Prélèvements</ows:Title>
+            <ows:Abstract>La loi fédérale du 24 janvier 1991 sur la protection des eaux (LEaux) est entrée en vigueur le 1er novembre 1992 et, avec elle, ses dispositions concernant les débits résiduels. Conformément aux art. 80 ss. LEaux, les débits résiduels doivent, sur ordre des autorités et dans la mesure du possible, être assainis. Dans cette perspective, une première étape consiste pour les cantons à dresser un inventaire des prélèvements d’eau existants et de transmettre celui-ci [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-entnahme</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a4ecf3a4-9943-4826-a997-9d7523e4d8ad"/>
+            <Style>
+                <ows:Title>Prélèvements</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-entnahme</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-entnahme_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-entnahme/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Dérivation</ows:Title>
+            <ows:Abstract>La loi fédérale du 24 janvier 1991 sur la protection des eaux (LEaux) est entrée en vigueur le 1er novembre 1992 et, avec elle, ses dispositions concernant les débits résiduels. Conformément aux art. 80 ss. LEaux, les débits résiduels doivent, sur ordre des autorités et dans la mesure du possible, être assainis. Dans cette perspective, une première étape consiste pour les cantons à dresser un inventaire des prélèvements d’eau existants et de transmettre celui-ci [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-leitungen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ae65e4e3-f47b-4544-a3a2-81dbf79d5a73"/>
+            <Style>
+                <ows:Title>Dérivation</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-leitungen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-leitungen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-leitungen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Restitution</ows:Title>
+            <ows:Abstract>La loi fédérale du 24 janvier 1991 sur la protection des eaux (LEaux) est entrée en vigueur le 1er novembre 1992 et, avec elle, ses dispositions concernant les débits résiduels. Conformément aux art. 80 ss. LEaux, les débits résiduels doivent, sur ordre des autorités et dans la mesure du possible, être assainis. Dans cette perspective, une première étape consiste pour les cantons à dresser un inventaire des prélèvements d’eau existants et de transmettre celui-ci [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-rueckgabe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ed1931ac-81bc-4517-9860-80090e530e33"/>
+            <Style>
+                <ows:Title>Restitution</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-rueckgabe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-rueckgabe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20040101</Default>
+                <Value>20040101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-rueckgabe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sites de protection de la faune</ows:Title>
+            <ows:Abstract>Les sites de protection de la faune ont pour but la protection et la conservation de certaines espèces ainsi que la protection et la conservation de leurs biotopes. Les 42 districts francs se basent sur l’art. 11 de la loi sur la chasse. Le ski pratiqué en dehors de pistes et d’itinéraires balisés est interdit. La pratique d’activités de loisirs hivernales est ainsi soumise aux mêmes restrictions d’accès que dans les zones de tranquillité contraignantes dans les [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wrz-jagdbanngebiete_select</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=35f25047-ea29-4422-9497-3dac46e00eb9"/>
+            <Style>
+                <ows:Title>Sites de protection de la faune</ows:Title>
+                <ows:Identifier>ch.bafu.wrz-jagdbanngebiete_select</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wrz-jagdbanngebiete_select_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170109</Default>
+                <Value>20170109</Value>
+                <Value>20161101</Value>
+                <Value>20160106</Value>
+                <Value>20151103</Value>
+                <Value>20150106</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wrz-jagdbanngebiete_select/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones de tranquillité</ows:Title>
+            <ows:Abstract>Les animaux sauvages ont besoin de sites de repli dans lesquels ils ne sont pas dérangés. Selon la loi fédérale sur la chasse (art. 7, al. 4 LChP) les zones de tranquillité pour la faune sauvage servent à éviter des dérangements excessifs causés par l’augmentation des activités de loisirs. Il existe des zones de tranquillité contraignantes et des zones de tranquillité recommandées. Les zones de tranquillité contraignantes sont délimitées par le biais d’un proces [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wrz-wildruhezonen_portal</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4a0c8bc7-89d1-484e-a34a-454a31267c41"/>
+            <Style>
+                <ows:Title>Zones de tranquillité</ows:Title>
+                <ows:Identifier>ch.bafu.wrz-wildruhezonen_portal</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wrz-wildruhezonen_portal_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170109</Default>
+                <Value>20170109</Value>
+                <Value>20161101</Value>
+                <Value>20160106</Value>
+                <Value>20151103</Value>
+                <Value>20150106</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wrz-wildruhezonen_portal/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MEVE - zones à fréquence accrue</ows:Title>
+            <ows:Abstract>L'encéphalite à tiques ou méningo-encéphalite verno-estivale (MEVE) est une maladie infectieuse provoquée par le virus de la MEVE, qui peut entraîner une méningite. Elle est transmise par la piqûre d'une tique infectée. Les données montrent les zones présentant une fréquence accrue d'encéphalite à tiques. Ces dernières sont basées sur les données recueillies par le système de déclaration obligatoire des années 2007 à 2016. Elles ont été établies par  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bag.zecken-fsme-faelle</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=836e4e0e-f2b5-4cbc-a20a-62fca7fd2ebe"/>
+            <Style>
+                <ows:Title>MEVE - zones à fréquence accrue</ows:Title>
+                <ows:Identifier>ch.bag.zecken-fsme-faelle</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bag.zecken-fsme-faelle_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161231</Default>
+                <Value>20161231</Value>
+                <Value>20151231</Value>
+                <Value>20141231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bag.zecken-fsme-faelle/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MEVE - vaccination recommandée</ows:Title>
+            <ows:Abstract>L'encéphalite à tiques ou méningo-encéphalite verno-estivale (MEVE) est une maladie infectieuse provoquée par le virus de la MEVE, qui peut entraîner une méningite. Elle est transmise par la piqûre d'une tique infectée. Cette carte représente les régions où la vaccination contre la MEVE est recommandée. Elle se fonde sur les données du système de déclaration obligatoire depuis 1984 et sur les résultats d'études sur la proportion des tiques infectées. [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bag.zecken-fsme-impfung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c5b6314d-91ac-466b-ab97-4b7c3c6e5f94"/>
+            <Style>
+                <ows:Title>MEVE - vaccination recommandée</ows:Title>
+                <ows:Identifier>ch.bag.zecken-fsme-impfung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bag.zecken-fsme-impfung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161231</Default>
+                <Value>20161231</Value>
+                <Value>20151231</Value>
+                <Value>20141231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bag.zecken-fsme-impfung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones à risque de Borréliose</ows:Title>
+            <ows:Abstract>L'agent de la borréliose, ou maladie de Lyme, est la bactérie Borrelia burgdorferi. La transmission à l'homme se produit le plus souvent par des tiques infectées qui sucent le sang humain. Une infection à Borrelia burgdorferi peut conduire à une borréliose de Lyme (synonymes : maladie de Lyme ou borréliose). Cette maladie peut toucher plusieurs organes (peau, articulations, nerfs, méninges, mœlle épinière, cerveau, cœur, yeux).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bag.zecken-lyme</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ea45cb27-07e4-4969-8e97-b1151fb12cb7"/>
+            <Style>
+                <ows:Title>Zones à risque de Borréliose</ows:Title>
+                <ows:Identifier>ch.bag.zecken-lyme</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bag.zecken-lyme_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110613</Default>
+                <Value>20110613</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bag.zecken-lyme/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Inventaire fédéral ISOS</ows:Title>
+            <ows:Abstract>En règle générale, l’Inventaire fédéral des sites construits d’importance nationale à protéger en Suisse ISOS comprend les agglomérations permanentes qui méritent d’être protégées en Suisse. Celles-ci doivent comporter au moins dix bâtiments principaux sur la première édition de la carte Siegfried et être indiquées sur la carte nationale. L’ISOS établit des relevés de sites pouvant être comparés entre eux et coordonnés avec d’autres inventaires. L’Inventaire pro [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bak.bundesinventar-schuetzenswerte-ortsbilder</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=954451d0-f68a-4785-92e1-60aff077dd91"/>
+            <Style>
+                <ows:Title>Inventaire fédéral ISOS</ows:Title>
+                <ows:Identifier>ch.bak.bundesinventar-schuetzenswerte-ortsbilder</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bak.bundesinventar-schuetzenswerte-ortsbilder_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161001</Default>
+                <Value>20161001</Value>
+                <Value>20160222</Value>
+                <Value>20150511</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bak.bundesinventar-schuetzenswerte-ortsbilder/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Nombre d'opérateurs de raccord</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre le nombre de fournisseur de raccord par cellule, c'est-à-dire le nombre d'opérateurs fournissant des services sur leurs propres raccordements. En cliquant sur la cellule, on fait apparaître la liste des entreprises. Un autre clic sur l [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.anbieter-eigenes_festnetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b9b367de-baf0-47d9-b642-bd0f7f29c842"/>
+            <Style>
+                <ows:Title>Nombre d'opérateurs de raccord</ows:Title>
+                <ows:Identifier>ch.bakom.anbieter-eigenes_festnetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.anbieter-eigenes_festnetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.anbieter-eigenes_festnetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Fibre optique</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments un raccordement par la fibre optique est offert (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représentant la situation de la desserte n [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.anschlussart-glasfaser</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=89c839ce-d778-4f53-be64-68bdc458e8c0"/>
+            <Style>
+                <ows:Title>Fibre optique</ows:Title>
+                <ows:Identifier>ch.bakom.anschlussart-glasfaser</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.anschlussart-glasfaser_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.anschlussart-glasfaser/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Câble coaxial</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments un raccordement par câble coaxial (raccordement TV câblée) est offert (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représentant la situ [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.anschlussart-koaxialkabel</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=aed73a77-fc04-4406-8ba3-fd998e2625db"/>
+            <Style>
+                <ows:Title>Câble coaxial</ows:Title>
+                <ows:Identifier>ch.bakom.anschlussart-koaxialkabel</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.anschlussart-koaxialkabel_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.anschlussart-koaxialkabel/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Fil de cuivre</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments un raccordement par fil de cuivre (fil du téléphone) est offert (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représentant la situation  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.anschlussart-kupferdraht</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fdb8b91e-1cc5-4c7a-8db7-3e3833e8a486"/>
+            <Style>
+                <ows:Title>Fil de cuivre</ows:Title>
+                <ows:Identifier>ch.bakom.anschlussart-kupferdraht</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.anschlussart-kupferdraht_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.anschlussart-kupferdraht/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 1 Mbit/s descendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 1 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représent [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink1</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=484aec3b-befd-4b29-adb5-85365119192f"/>
+            <Style>
+                <ows:Title>Liaison ≥ 1 Mbit/s descendante</ows:Title>
+                <ows:Identifier>ch.bakom.downlink1</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink1_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink1/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥10 Mbit/s descend.</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 10 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink10</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=662ddb1a-b016-4d66-97dc-3f97fe092d39"/>
+            <Style>
+                <ows:Title>Liaison ≥10 Mbit/s descend.</ows:Title>
+                <ows:Identifier>ch.bakom.downlink10</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink10_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink10/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 100 Mbit/s descend.</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 100 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représe [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink100</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=0be906d8-ce6d-436c-8690-749a892ef5bb"/>
+            <Style>
+                <ows:Title>Liaison ≥ 100 Mbit/s descend.</ows:Title>
+                <ows:Identifier>ch.bakom.downlink100</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink100_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink100/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 2 Mbit/s descendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 2 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représent [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a5f0a7d8-4e9f-43b5-ae73-0966df615d96"/>
+            <Style>
+                <ows:Title>Liaison ≥ 2 Mbit/s descendante</ows:Title>
+                <ows:Identifier>ch.bakom.downlink2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 20 Mbit/s descend.</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 20 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink20</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=38b6998c-713b-4c69-b84e-2ebe9c538f2f"/>
+            <Style>
+                <ows:Title>Liaison ≥ 20 Mbit/s descend.</ows:Title>
+                <ows:Identifier>ch.bakom.downlink20</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink20_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink20/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 50 Mbit/s descend.</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet descendante de 50 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.downlink50</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9b63de18-3f5a-437d-804a-40eba5596890"/>
+            <Style>
+                <ows:Title>Liaison ≥ 50 Mbit/s descend.</ows:Title>
+                <ows:Identifier>ch.bakom.downlink50</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.downlink50_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.downlink50/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 1 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 1 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représenta [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink1</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=04ade34e-9654-4dfa-8788-ac6a3da206d6"/>
+            <Style>
+                <ows:Title>Liaison ≥ 1 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink1</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink1_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink1/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 10 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 10 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représent [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink10</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=41263c2e-bec9-4b1e-9e2d-11d69f8df58c"/>
+            <Style>
+                <ows:Title>Liaison ≥ 10 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink10</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink10_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink10/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥100 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 100 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink100</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4f9876c4-5fa6-4cbc-b3db-b5934c681e7b"/>
+            <Style>
+                <ows:Title>Liaison ≥100 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink100</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink100_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink100/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 2 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 2 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représenta [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4c6dfd42-9046-4b97-806c-eaa18377e6c0"/>
+            <Style>
+                <ows:Title>Liaison ≥ 2 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 20 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 20 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représent [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink20</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fe828fd1-b1a9-4b7c-b1ee-39fef49a1348"/>
+            <Style>
+                <ows:Title>Liaison ≥ 20 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink20</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink20_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink20/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Liaison ≥ 50 Mbit/s ascendante</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments une liaison internet ascendante de 50 Mbit/s ou plus est offerte sur réseau fixe (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représent [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.uplink50</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e1312b14-d1c2-4b82-a7a9-807be7b8e0de"/>
+            <Style>
+                <ows:Title>Liaison ≥ 50 Mbit/s ascendante</ows:Title>
+                <ows:Identifier>ch.bakom.uplink50</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.uplink50_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.uplink50/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Disponibilité HDTV réseau fixe</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments la télévision sur réseau fixe est offerte en haute résolution (HD) (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représentant la situati [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.verfuegbarkeit-hdtv</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=cd1a0328-e765-49b9-8c2a-92b4d411b770"/>
+            <Style>
+                <ows:Title>Disponibilité HDTV réseau fixe</ows:Title>
+                <ows:Identifier>ch.bakom.verfuegbarkeit-hdtv</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.verfuegbarkeit-hdtv_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.verfuegbarkeit-hdtv/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Disponibilité TV réseau fixe</ows:Title>
+            <ows:Abstract>L'atlas large bande donne un aperçu de la desserte de la Suisse en réseaux modernes de télécommunication. La situation est représentée sous la forme de données statistiques par cellule (250x250 mètres). La carte montre dans combien de bâtiments la télévision sur réseau fixe est offerte (en pour cent des entrées de bâtiment selon les données de l'Office fédéral de la statistique). Il se peut que l'image représentant la situation de la desserte ne corr [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.verfuegbarkeit-tv</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9509aa85-bde5-40c2-867d-5aea0ce20c7c"/>
+            <Style>
+                <ows:Title>Disponibilité TV réseau fixe</ows:Title>
+                <ows:Identifier>ch.bakom.verfuegbarkeit-tv</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.verfuegbarkeit-tv_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161119</Default>
+                <Value>20161119</Value>
+                <Value>20160622</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.verfuegbarkeit-tv/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones de diffusion TV</ows:Title>
+            <ows:Abstract>Zones de desserte de tous les diffuseurs privés, régionaux et locaux de programmes de télévision chargés d'un mandat de prestations et au bénéfice d'une quote-part de la redevance selon l'art. 38, ou chargés d'un mandat de prestations selon l'art. 43 de la loi fédérale sur la radio et la télévision (LRTV). Les prescriptions techniques correspondantes, les principes applicables à la planification et les contours des zones de desserte évoquées  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.versorgungsgebiet-tv</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f57f174b-15ab-4428-b41f-916f33ea4cbb"/>
+            <Style>
+                <ows:Title>Zones de diffusion TV</ows:Title>
+                <ows:Identifier>ch.bakom.versorgungsgebiet-tv</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.versorgungsgebiet-tv_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070704</Default>
+                <Value>20070704</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.versorgungsgebiet-tv/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones de diffusion radio</ows:Title>
+            <ows:Abstract>Zones de desserte de tous les diffuseurs privés, régionaux et locaux de programmes de radio chargés d'un mandat de prestations et au bénéfice d'une quote-part de la redevance selon l'art. 38, ou chargés d'un mandat de prestations selon l'art. 43 de la loi fédérale sur la radio et la télévision (LRTV). Les prescriptions techniques correspondantes, les principes applicables à la planification et les contours des zones de desserte évoquées à l&# [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bakom.versorgungsgebiet-ukw</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=60a2fcd0-3a04-4fea-9bae-c3e0f9b31604"/>
+            <Style>
+                <ows:Title>Zones de diffusion radio</ows:Title>
+                <ows:Identifier>ch.bakom.versorgungsgebiet-ukw</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bakom.versorgungsgebiet-ukw_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070704</Default>
+                <Value>20070704</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bakom.versorgungsgebiet-ukw/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>UNESCO sites culturels</ows:Title>
+            <ows:Abstract>La Convention pour la protection du patrimoine mondial culturel et naturel (RS 0.451.41) a été conclue par la Conférence générale de l’UNESCO en 1972. Elle vise à conserver les biens culturels et naturels qui ont une valeur universelle exceptionnelle en tant que partie du patrimoine de l’humanité. Les Etats signataires s’engagent à protéger et à conserver les objets situés sur leur territoire. La Suisse a proposé jusqu’à présent huit sites culturels et trois sit [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bak.schutzgebiete-unesco_weltkulturerbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fb349ad4-5e01-43b7-9fcd-a0f60ae9c4db"/>
+            <Style>
+                <ows:Title>UNESCO sites culturels</ows:Title>
+                <ows:Identifier>ch.bak.schutzgebiete-unesco_weltkulturerbe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bak.schutzgebiete-unesco_weltkulturerbe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160717</Default>
+                <Value>20160717</Value>
+                <Value>20120203</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bak.schutzgebiete-unesco_weltkulturerbe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Arrêts tp</ows:Title>
+            <ows:Abstract>Le jeu de géodonnées de base « Arrêts des transports publics » contient les arrêts ainsi que des sites ponctuels géoréférencés qui ont une fonction d’exploitation ou structurante dans les transports publics (points de service).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bav.haltestellen-oev</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=841d42ff-8177-4e07-a96b-e8e5455ae048"/>
+            <Style>
+                <ows:Title>Arrêts tp</ows:Title>
+                <ows:Identifier>ch.bav.haltestellen-oev</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bav.haltestellen-oev_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161211</Default>
+                <Value>20161211</Value>
+                <Value>20151213</Value>
+                <Value>20150127</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bav.haltestellen-oev/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau ferré</ows:Title>
+            <ows:Abstract>Le jeu de géodonnées de base « réseau ferré » représente le réseau suisse des transports guidéspar rail sous surveillance fédérale. Il comprend les tronçons à voie normale et étroite des chemins de fer, des trams et des chemins de fer à crémaillère sur lesquels des voyageurs sont transportés régulièrement et à titre professionnel ou sur lesquels l’accès au réseau est possible. Il ne contient pas les voies de raccordement ni les tronçons de funiculaires (jeu de d [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bav.schienennetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4545b545-cdc9-4713-809c-210ee84436b0"/>
+            <Style>
+                <ows:Title>Réseau ferré</ows:Title>
+                <ows:Identifier>ch.bav.schienennetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bav.schienennetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161211</Default>
+                <Value>20161211</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bav.schienennetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte aéronautique OACI</ows:Title>
+            <ows:Abstract>La carte aéronautique OACI au 1:500'000 est la carte aéronautique officielle de la Suisse publiée en collaboration avec skyguide. Sur la carte figurent les aéroports et aérodromes, les espaces aériens par classes, les zones interdites ou dangereuses ainsi que les obstacles à la navigation aérienne. La carte est disponible sous forme analogique (carte papier) et digitale (carte-pixel). La feuille de l'édition imprimée est disponible pliée. En marge de la  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bazl.luftfahrtkarten-icao</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f27432fa-948b-4608-98d5-22ebe118c98a"/>
+            <Style>
+                <ows:Title>Carte aéronautique OACI</ows:Title>
+                <ows:Identifier>ch.bazl.luftfahrtkarten-icao</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bazl.luftfahrtkarten-icao_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_19</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bazl.luftfahrtkarten-icao/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones réservées: aéroports</ows:Title>
+            <ows:Abstract>Zone clairement délimitée dont les terrains sont réservés en vue de futures installations aéroportuaires. Représentation des parcelles sur un plan à grande échelle. Les modifications de construction contraires à cette affectation ne sont pas admises. Durée limitée à une période de cinq ans prorogeable de trois ans au plus. Base légale (LA, art. 37n, al. 1): «En vue d’assurer la libre disposition des terrains nécessaires à des installations d’aéroport, l’Office f [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bazl.projektierungszonen-flughafenanlagen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d76d6e8d-c6ac-40f3-92c0-2a953cb99d9f"/>
+            <Style>
+                <ows:Title>Zones réservées: aéroports</ows:Title>
+                <ows:Identifier>ch.bazl.projektierungszonen-flughafenanlagen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bazl.projektierungszonen-flughafenanlagen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130822</Default>
+                <Value>20130822</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bazl.projektierungszonen-flughafenanlagen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte vol à voile</ows:Title>
+            <ows:Abstract>La carte de vol à voile au 1:300'000 est publiée en collaboration avec skyguide. Sur la carte figurent les aéroports et aérodromes, les espaces aériens par classes, les zones interdites ou dangereuses, les obstacles à la navigation aérienne ainsi que d'autres informations concernant la pratique du vol à voile. La carte est disponible sous forme analogique (carte papier) et digitale (carte-pixel). La feuille de l'édition imprimée est disponible pliée. [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bazl.segelflugkarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=eba8c71c-0c66-4a4e-b419-5e0260d5b43c"/>
+            <Style>
+                <ows:Title>Carte vol à voile</ows:Title>
+                <ows:Identifier>ch.bazl.segelflugkarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bazl.segelflugkarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_19</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bazl.segelflugkarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Centrales nucléaires</ows:Title>
+            <ows:Abstract>Les centrales nucléaires sont des installations qui utilisent la fission nucléaire contrôlée pour produire de l’électricité dans un but commercial. Les quatre centrales nucléaires suisses totalisent une puissance de 3,2 GW et leur disponibilité annuelle atteint environ 90%. L’Office fédéral de l’énergie (OFEN) accomplit des tâches importantes en matière d’application de la législation sur l’énergie nucléaire. Etablissement de droit public autonome de la Confédér [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.kernkraftwerke</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=74e0e4a7-165a-414d-b1a5-1921162f04ab"/>
+            <Style>
+                <ows:Title>Centrales nucléaires</ows:Title>
+                <ows:Identifier>ch.bfe.kernkraftwerke</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.kernkraftwerke_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161111</Default>
+                <Value>20161111</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.kernkraftwerke/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Potentiel petite hydraulique</ows:Title>
+            <ows:Abstract>Le produit de géodonnées «Kleinwasserkraftpotentiale der Schweizer Gewässer» (potentiel des cours d'eau suisses pour la petite hydraulique) est le résultat d'une analyse SIG menée dans le cadre du programme de recherche 102835 «Erhebung des Kleinwasserkraftpotentials der Schweiz» (Relevé du potentiel de la petite hydraulique en Suisse). Il calcule le potentiel hydroélectrique théorique de tous les cours d'eau naturels de la Suisse. Lors de l'inte [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.kleinwasserkraftpotentiale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c4b695b0-23ad-4d0d-a496-16fc0f597819"/>
+            <Style>
+                <ows:Title>Potentiel petite hydraulique</ows:Title>
+                <ows:Identifier>ch.bfe.kleinwasserkraftpotentiale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.kleinwasserkraftpotentiale_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120531</Default>
+                <Value>20120531</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.kleinwasserkraftpotentiale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Fréquence de givrage</ows:Title>
+            <ows:Abstract>En Suisse, les zones propices à l’exploitation de l’énergie éolienne se trouvent notamment sur les hauteurs du Jura, dans les Apes et les Préalpes, soit des régions où la température demeure régulièrement et longtemps au-dessous de 0 °C en hiver. Les effets du givre sur les instruments de mesure et les pales des éoliennes entrent donc en considération.Le givrage influence la planification et l’exploitation d’une éolienne de diverses façons: son dépôt sur les pal [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.meteorologische-vereisung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=94cedad7-6d19-46b2-9ecf-0d1d1a58bea8"/>
+            <Style>
+                <ows:Title>Fréquence de givrage</ows:Title>
+                <ows:Identifier>ch.bfe.meteorologische-vereisung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.meteorologische-vereisung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100531</Default>
+                <Value>20100531</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.meteorologische-vereisung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Solaire: aptitude des toitures</ows:Title>
+            <ows:Abstract>L’énergie solaire qui atteint la surface terrestre peut être exploitée au moyen de deux technologies éprouvées que sont le photovoltaïque (électricité) et le solaire thermique (chaleur), pour produire soi-même une énergie renouvelable.Le potentiel de l’électricité d’origine solaire est considérable: en 2050, le photovoltaïque pourrait couvrir environ 20% des besoins en électricité. Grâce à des installations standardisées, la chaleur solaire constitue une option  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.solarenergie-eignung-daecher</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b614de5c-2f12-4355-b2c9-7aef2c363ad6"/>
+            <Style>
+                <ows:Title>Solaire: aptitude des toitures</ows:Title>
+                <ows:Identifier>ch.bfe.solarenergie-eignung-daecher</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.solarenergie-eignung-daecher_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.solarenergie-eignung-daecher/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Solaire: potentiel des façades</ows:Title>
+            <ows:Abstract>L'énergie solaire qui atteint la surface terrestre peut être exploitée au moyen de deux technologies éprouvées que sont le photovoltaïque (électricité) et le solaire thermique (chaleur), pour produire soi-même une énergie renouvelable.Le potentiel de l'électricité d'origine solaire est considérable: en 2050, le photovoltaïque pourrait couvrir environ 20% des besoins en électricité. Grâce à des installations standardisées, la chaleur solaire constitue [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.solarenergie-eignung-fassaden</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=3849f57d-9bdd-428c-8d13-08be446e197a"/>
+            <Style>
+                <ows:Title>Solaire: potentiel des façades</ows:Title>
+                <ows:Identifier>ch.bfe.solarenergie-eignung-fassaden</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.solarenergie-eignung-fassaden_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160926</Default>
+                <Value>20160926</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.solarenergie-eignung-fassaden/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Installations éoliennes</ows:Title>
+            <ows:Abstract>Les installations éoliennes utilisent l’énergie cinétique des masses d’air qui se déplacent pour faire tourner des hélices. L’énergie mécanique ainsi générée est ensuite transformée en énergie électrique grâce à un générateur. D’une puissance de 28 kW, la première centrale éolienne suisse a été mise en service en 1986 près de la ferme Soolhof (Langenbruck). En 2013, notre pays compte 34 installations éoliennes, qui produisent ensemble quelque 85 gigawattheures ( [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfe.windenergieanlagen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b11962c5-cad9-4783-9e88-d8248e90c47f"/>
+            <Style>
+                <ows:Title>Installations éoliennes</ows:Title>
+                <ows:Identifier>ch.bfe.windenergieanlagen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfe.windenergieanlagen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140101</Default>
+                <Value>20140101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfe.windenergieanlagen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 2004/09 NOAS04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 72 catégories de base, 17 et 27 classes, et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couvertur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8ac687ee-ad27-4ac7-8c1c-b64abee9e3b3"/>
+            <Style>
+                <ows:Title>Stat. superficie 2004/09 NOAS04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. de la superficie 1979/85 NOAS04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 72 catégories de base, 17 et 27 classes, et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couvertur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-1985</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=0dff304b-d90c-4f9c-bd9d-f3c315a128c2"/>
+            <Style>
+                <ows:Title>Stat. de la superficie 1979/85 NOAS04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-1985</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-1985_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-1985/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 1992/97 NOAS04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 72 catégories de base, 17 et 27 classes, et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couvertur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-1997</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=260bbbe0-0c10-4a31-b566-cd0d6f143a09"/>
+            <Style>
+                <ows:Title>Stat. superficie 1992/97 NOAS04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-1997</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-1997_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-1997/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 2004/09 NOLC04</ows:Title>
+            <ows:Abstract>Couverture du sol selon 27 catégories de base et 6 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le mode d'u [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b53c03bb-a168-491f-b266-c7e9ec0af320"/>
+            <Style>
+                <ows:Title>Stat. superficie 2004/09 NOLC04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodenbedeckung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 1979/85 NOLC04</ows:Title>
+            <ows:Abstract>Couverture du sol selon 27 catégories de base et 6 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le mode d'u [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung-1985</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1c6bc7a0-b243-49f0-9078-6576b37716b7"/>
+            <Style>
+                <ows:Title>Stat. superficie 1979/85 NOLC04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung-1985</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung-1985_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodenbedeckung-1985/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 1992/97 NOLC04</ows:Title>
+            <ows:Abstract>Couverture du sol selon 27 catégories de base et 6 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le mode d'u [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung-1997</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=af74a95b-7295-47b8-8cfe-795e9a09a086"/>
+            <Style>
+                <ows:Title>Stat. superficie 1992/97 NOLC04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodenbedeckung-1997</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung-1997_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodenbedeckung-1997/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 2004/09 NOLU04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 46 catégories de base, 10 classes et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodennutzung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5082c28a-33cc-47d6-a577-a6118238def5"/>
+            <Style>
+                <ows:Title>Stat. superficie 2004/09 NOLU04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodennutzung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodennutzung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodennutzung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 1979/85 NOLU04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 46 catégories de base, 10 classes et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodennutzung-1985</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f954beeb-7f1e-44a4-b975-19ea9b8c369f"/>
+            <Style>
+                <ows:Title>Stat. superficie 1979/85 NOLU04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodennutzung-1985</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodennutzung-1985_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodennutzung-1985/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stat. superficie 1992/97 NOLU04</ows:Title>
+            <ows:Abstract>Utilisation du sol selon 46 catégories de base, 10 classes et 4 domaines principaux, relevée par interprétation visuelle de points d’échantillonnage distants de 100m et affichés sur des images aériennes digitales en 3 dimensions. Pour la première fois, on relève de manière distincte la couverture et l’utilisation du sol , de sorte que chaque point d'échantillonnage se voit assorti de deux codes. On peut ainsi soit considérer seuls le type de couverture ou le [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-bodennutzung-1997</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5257c12e-bb39-4983-a98a-8103cb3f1611"/>
+            <Style>
+                <ows:Title>Stat. superficie 1992/97 NOLU04</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-bodennutzung-1997</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-bodennutzung-1997_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131121</Default>
+                <Value>20131121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-bodennutzung-1997/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Utilisation simplifiée du sol</ows:Title>
+            <ows:Abstract>Parmi les besoins en informations sur l'utilisation et la couverture des sols figurent aussi les représentations cartographiques. La statistique suisse de la superficie est constituée de points d'échantillonnage qui ne représentent pas à proprement parler des surfaces. La reproduction cartographique de ses résultats est par conséquent problématique et ne mènerait qu'à une image peu homogène, tourmentée et finalement peu plausible, sur laquelle certai [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-hintergrund</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f03f085a-6bff-4063-b664-5546e32ba2e2"/>
+            <Style>
+                <ows:Title>Utilisation simplifiée du sol</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-hintergrund</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-hintergrund_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070116</Default>
+                <Value>20070116</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-hintergrund/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mixité des forêts 1990/1992</ows:Title>
+            <ows:Abstract>Sur la base des images satellite Landsat-TM l'OFS a produit 1996 dans le cadre du projet "Différenciation de la forêt à l'aide d'images numériques de satellite" deux jeux de données couvrant toute la Suisse, qui répartissent la forêt dans les catégories forêt résineuse, forêt à prédominance résineuse, forêt à prédominance feuillue et forêt feuillue. Ce projet contribuera d'une part à l'acquisition d'expérience et de connaissances  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.arealstatistik-waldmischungsgrad</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=116447b0-31b0-477c-9203-9f51d43e4ac5"/>
+            <Style>
+                <ows:Title>Mixité des forêts 1990/1992</ows:Title>
+                <ows:Identifier>ch.bfs.arealstatistik-waldmischungsgrad</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.arealstatistik-waldmischungsgrad_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19970901</Default>
+                <Value>19970901</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.arealstatistik-waldmischungsgrad/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Registre des bâtiments et des logements</ows:Title>
+            <ows:Abstract>Le Registre fédéral des bâtiments et des logements (RegBL) contient les principales données de base sur les bâtiments et les logements. Il est utilisé à des fins statistiques, de recherche ou de planification, et il permet aux cantons et communes d'exécuter certaines tâches que leur assigne la loi. La mise à jour est effectuée en coordination avec la statistique de la construction et des logements. Chaque bâtiment et chaque logement dispose d'un numéro d [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bfs.gebaeude_wohnungs_register</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=56553efe-4a2c-449d-93ba-cf7edd518d56"/>
+            <Style>
+                <ows:Title>Registre des bâtiments et des logements</ows:Title>
+                <ows:Identifier>ch.bfs.gebaeude_wohnungs_register</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bfs.gebaeude_wohnungs_register_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160208</Default>
+                <Value>20160208</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_20</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bfs.gebaeude_wohnungs_register/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Produits d'alpage</ows:Title>
+            <ows:Abstract>Pour pouvoir porter la désignation "produit d'alpage" (p. ex. fromage d'alpage), les matières premières utilisées doivent provenir de la région d'estivage et avoir été également transformées dans celle-ci. Si la transformation a lieu en dehors de la région d'estivage, seule l'origine des matières premières pourra être mentionnée (p. ex. "yoghourt au lait d'alpage"). Cette règle ne s'applique pas au fromage. En l'oc [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.alpprodukte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=843b3f48-ec98-4143-b9e6-1db1ad6ddac0"/>
+            <Style>
+                <ows:Title>Produits d'alpage</ows:Title>
+                <ows:Identifier>ch.blw.alpprodukte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.alpprodukte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150422</Default>
+                <Value>20150422</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.alpprodukte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Produits montagne et alpage</ows:Title>
+            <ows:Abstract>Pour pouvoir porter la désignation "produit de montagne" (p. ex. fromage de montagne), les matières premières utilisées doivent provenir de la région de montagne ou de la région d'estivage et avoir été également transformées dans des communes entièrement ou partiellement situées dans la région de montagne ou d'estivage. Si la transformation a lieu en dehors de la région de montagne ou de la région d'estivage, seule l'origine des matières  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bergprodukte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c5bc9d6b-cafb-4617-97d7-868ab4cd5506"/>
+            <Style>
+                <ows:Title>Produits montagne et alpage</ows:Title>
+                <ows:Identifier>ch.blw.bergprodukte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bergprodukte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150422</Default>
+                <Value>20150422</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bergprodukte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Besoins en irrigation</ows:Title>
+            <ows:Abstract>Langjähriges 33 % Quantil der relativen Evapotranspiration (Ver-hältnis von aktueller zu potenzieller Evapotranspiration, ET/ETP) für die landwirtschaftliche Nutzfläche der Schweiz; Berechnung für die Vegetationsperioden des Zeitraumes 1980-2006 im500m x 500m Raster.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bewaesserungsbeduerftigkeit</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a3acc755-aad5-4992-b3f3-91f1137a94cb"/>
+            <Style>
+                <ows:Title>Besoins en irrigation</ows:Title>
+                <ows:Identifier>ch.blw.bewaesserungsbeduerftigkeit</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bewaesserungsbeduerftigkeit_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20091110</Default>
+                <Value>20091110</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bewaesserungsbeduerftigkeit/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Profondeur</ows:Title>
+            <ows:Abstract>Profondeur du sol exploitable par les racines (enracinement général; on ne tient pas compte par exemple de racines pénétrant dans des crevasses).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-gruendigkeit</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a1c56c8d-05c9-425f-9aed-71e265081634"/>
+            <Style>
+                <ows:Title>Profondeur</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-gruendigkeit</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-gruendigkeit_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-gruendigkeit/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sols: Terres cultivées</ows:Title>
+            <ows:Abstract>Sur la carte, chaque unité cartographique est assortie d'un code composé d'une lettre majuscule et d'un chiffre. Les majuscules représentent 25 différentes unités géologiques et géomorphologiques. Les lettres sont subdvisées en divers éléments du paysage, ordonnés selon le type de roche-mère, l'exposition et la pente. En outre, à chaque unité cartographique correspond un ou plusieurs types de sol. Les 144 unités cartographiques sont réparties sur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-kulturland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=843de9c9-6feb-4577-ab3b-e4fb62a9c56a"/>
+            <Style>
+                <ows:Title>Sols: Terres cultivées</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-kulturland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-kulturland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-kulturland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sols: Typologies des cultures</ows:Title>
+            <ows:Abstract>Sur la carte, chaque unité cartographique est assortie d'un code composé d'une lettre majuscule et d'un chiffre. Les majuscules représentent 25 différentes unités géologiques et géomorphologiques. Les lettres sont subdvisées en divers éléments du paysage, ordonnés selon le type de roche-mère, l'exposition et la pente. En outre, à chaque unité cartographique correspond un ou plusieurs types de sol. Les 144 unités cartographiques sont réparties sur [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-kulturtyp</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4d7ea1c8-451b-46b6-8e16-ffee10e0c9a7"/>
+            <Style>
+                <ows:Title>Sols: Typologies des cultures</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-kulturtyp</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-kulturtyp_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-kulturtyp/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Rétention substances nutritives</ows:Title>
+            <ows:Abstract>Comme pour l'eau, on peut donner le nombre d'équivalents en cation que le sol peut retenir. Ces milliéquivalents sont donnés pour un colonne de sol de 1 cm2 de base et d'une hauteur correspondante à la profondeur physiologique. On en tire le nombre de milliéquivalents (mev) de cations par cm2.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-naehrstoffspeichervermoegen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=05216096-7514-4084-a361-49a2cee1f44c"/>
+            <Style>
+                <ows:Title>Rétention substances nutritives</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-naehrstoffspeichervermoegen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-naehrstoffspeichervermoegen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-naehrstoffspeichervermoegen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Pierrosité</ows:Title>
+            <ows:Abstract>On entend par pierrosité l'ensemble des fragments minéraux plus gros que 2 mm (refus du tamis). Envisagés principalement dans les 50 cm supérieurs du profil du sol.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-skelettgehalt</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b07f2385-ee3d-4dae-aac2-3fce678ead33"/>
+            <Style>
+                <ows:Title>Pierrosité</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-skelettgehalt</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-skelettgehalt_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-skelettgehalt/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mouillure</ows:Title>
+            <ows:Abstract>La mouillure est le fait d'une nappe phréatique (de pente ou de fond).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-vernaessung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ace71da1-bfd1-4745-a2f1-40b4567f4907"/>
+            <Style>
+                <ows:Title>Mouillure</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-vernaessung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-vernaessung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-vernaessung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Perméabilité</ows:Title>
+            <ows:Abstract>La perméabilité est mesurée en laboratoire sur des échantillons cylindriques saturés. Les observations de terrain permettent d'etablir des relations entre les précipitations, la perméablilité et les traits morphologiques. On a pris en considération l'horizon le moins perméable des 50 cm supérieurs.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-wasserdurchlaessigkeit</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d5bd22a3-0656-4582-97bc-37f77b5426ca"/>
+            <Style>
+                <ows:Title>Perméabilité</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-wasserdurchlaessigkeit</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-wasserdurchlaessigkeit_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-wasserdurchlaessigkeit/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Capacité de rétention hydrique</ows:Title>
+            <ows:Abstract>Il s'agit de l'eau qui est retenue dans le sol par les forces de tension et qui est facilement accessible aux plantes (0,1 - 1,0 atm). On peut admettre grosso modo 1 mm d'eau est facilement accessible par 1 cm de profondeur physiologique. La profondeur physiologique s'obtient à partir de la profondeur d'enracinement, sous déduction de la place des pierres, de celle des gros vides dans les sols sablo-graveleux, d'éléments structuraux compa [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.bodeneignung-wasserspeichervermoegen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=6caf4d0f-52da-433a-809f-92781316ad0e"/>
+            <Style>
+                <ows:Title>Capacité de rétention hydrique</ows:Title>
+                <ows:Identifier>ch.blw.bodeneignung-wasserspeichervermoegen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.bodeneignung-wasserspeichervermoegen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.bodeneignung-wasserspeichervermoegen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Risque d’érosion qualitatif 1</ows:Title>
+            <ows:Abstract>Carte des risques d’érosion de la surface agricole utile au raster 2x2 m, sur la base du modèle MNT-MO. Cette carte couvre la région de plaine (région de plaine et des collines). Elle indique le risque d’érosion qualitatif potentiel en cas d’exploitation permanente des terres arables. L’évaluation globale est attribuée à l’un des trois niveaux de risque (pas de risque, risque avéré, risque élevé), sans tenir compte de l’utilisation ou du mode d’exploitation du s [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.erosion</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=02210bb3-1c51-4c2c-a665-a696286b945c"/>
+            <Style>
+                <ows:Title>Risque d’érosion qualitatif 1</ows:Title>
+                <ows:Identifier>ch.blw.erosion</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.erosion_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100103</Default>
+                <Value>20100103</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.erosion/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Risque d’érosion qualitatif 2</ows:Title>
+            <ows:Abstract>Carte des risques d’érosion de la surface agricole utile dans une grille de 2x2 mètres, sur la base du modèle MNT-MO. La carte comprend la région de plaine (région de plaine et des collines) et les régions de montagne I + II. On montre ainsi le risque potentiel qualitativ d’érosion en cas d’exploitation permanente des terres arables. L’évaluation globale est attribuée à l’un des trois niveaux de risque (pas de risque, risque avéré, risque élevé), sans tenir comp [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.erosion-mit_bergzonen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c71cbdaf-d9db-42b6-a5d3-a24b6aa075a7"/>
+            <Style>
+                <ows:Title>Risque d’érosion qualitatif 2</ows:Title>
+                <ows:Identifier>ch.blw.erosion-mit_bergzonen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.erosion-mit_bergzonen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100103</Default>
+                <Value>20100103</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.erosion-mit_bergzonen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Risque d’érosion quantitatif</ows:Title>
+            <ows:Abstract>Carte des risques d’érosion de la surface agricole utile de la Suisse au raster 2x2 m, sur la base du modèle MNT-MO. Cette carte indique la perte moyenne potentielle de sol sur un grand nombre d’années en tonnes par hectare et par an, calculée sur la base d'une jachère nue, autrement dit l'érosion qui pourrait théoriquement se produire si le sol était nu en permanence. Une couleur a été attribuée à chacune des classes de risque définies (trois couleurs)  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.erosion-quantitativ</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=14c92382-adf0-45d9-ad07-d41bd976c2a3"/>
+            <Style>
+                <ows:Title>Risque d’érosion quantitatif</ows:Title>
+                <ows:Identifier>ch.blw.erosion-quantitativ</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.erosion-quantitativ_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20100601</Default>
+                <Value>20100601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.erosion-quantitativ/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte de blocs de parcelles</ows:Title>
+            <ows:Abstract>Un bloc de parcelles est une surface d’un seul tenant, utilisable pour l’agriculture, qui est entourée par des limites extérieures relativement stables et identifiables dans la nature (par exemple forêt, routes, surfaces construites, cours d’eau, fossés). Un bloc de parcelles est ainsi une sorte de bassin hydrologique fermé, car tous les pixels dans le bloc de parcelles sont liés ensemble sur le plan hydrologique et peuvent donc s’influencer mutuellement du poin [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.feldblockkarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9d673266-aed0-46f3-a536-4eb7d57582e9"/>
+            <Style>
+                <ows:Title>Carte de blocs de parcelles</ows:Title>
+                <ows:Identifier>ch.blw.feldblockkarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.feldblockkarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120601</Default>
+                <Value>20120601</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.feldblockkarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Surface en connection des eaux</ows:Title>
+            <ows:Abstract>La carte potentielle des surfaces attenantes à un cours d’eau représente, dans le cas d'un « Scénario du pire », (jachère nue permanente, pas de bordures tampons, mesures de construction), les surfaces sur lesquelles il faut s’attendre à un risque élevé d’apports de substances polluantes dans les eaux lors d’exploitation non adaptée aux conditions locales. Cette carte constitue donc un outil pour une planification ciblée de la protection des eaux. Le modèle  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.gewaesseranschlusskarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=77c1fecd-d698-442f-b957-65664297b26d"/>
+            <Style>
+                <ows:Title>Surface en connection des eaux</ows:Title>
+                <ows:Identifier>ch.blw.gewaesseranschlusskarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.gewaesseranschlusskarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121201</Default>
+                <Value>20121201</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.gewaesseranschlusskarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Surface en connection élargie</ows:Title>
+            <ows:Abstract>A titre de complément, une autre carte a été établie qui différencie les surfaces attenantes à des cours d’eau, entre surfaces en connexion directe et surfaces en connexion indirecte. Les surfaces en connexion directe se situent à côté de cours d’eau ou sont connectées à des cours d’eau par des fossés de drainage temporaire ou par des isobathes. L’écoulement des eaux de surfaces peut parvenir aussi indirectement dans les cours d’eau par les puits de drainage et  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.gewaesseranschlusskarte-direkt</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f03ce6ec-d927-4171-88a4-2369a75d4685"/>
+            <Style>
+                <ows:Title>Surface en connection élargie</ows:Title>
+                <ows:Identifier>ch.blw.gewaesseranschlusskarte-direkt</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.gewaesseranschlusskarte-direkt_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121201</Default>
+                <Value>20121201</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.gewaesseranschlusskarte-direkt/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Terrains en pente</ows:Title>
+            <ows:Abstract>Afin que la difficulté des conditions de production et de vie dans l’agriculture soit équitablement prise en compte, des contributions pour des terrains en pente sont versées pour les surfaces donnant droit aux paiements directs. Pour les paiements directs généraux, deux jeux de géodonnées ont été créés : un sur terrains en pente (OGéo 152.1 ; OPD art. 43) et un sur les vignobles en pente (OGéo 152.2 ; DZV art. 45). Plusieurs classes de déclivité sont prises en  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.hang_steillagen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=689dcf53-f025-4ea2-890a-dfcebca5812f"/>
+            <Style>
+                <ows:Title>Terrains en pente</ows:Title>
+                <ows:Identifier>ch.blw.hang_steillagen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.hang_steillagen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121231</Default>
+                <Value>20121231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.hang_steillagen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - culture fourragère</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-futterbau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4f01b7dd-a576-45ee-9158-82789334c577"/>
+            <Style>
+                <ows:Title>Climat - culture fourragère</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-futterbau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-futterbau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-futterbau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - cultures céréalières</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-getreidebau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=04aa6587-d884-4c20-87a3-ff537e6d2626"/>
+            <Style>
+                <ows:Title>Climat - cultures céréalières</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-getreidebau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-getreidebau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-getreidebau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - pommes de terre</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-kartoffeln</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=859f26d4-f820-4b1f-bad4-44e88bae59a6"/>
+            <Style>
+                <ows:Title>Climat - pommes de terre</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-kartoffeln</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-kartoffeln_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-kartoffeln/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - maïs grain</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-koernermais</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=aaa31b34-09da-4944-b43e-fb1b21cc6f96"/>
+            <Style>
+                <ows:Title>Climat - maïs grain</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-koernermais</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-koernermais_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-koernermais/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - terres cultivées</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-kulturland</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8148d26b-7aae-48b1-8c02-a391c33f59a7"/>
+            <Style>
+                <ows:Title>Climat - terres cultivées</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-kulturland</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-kulturland_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-kulturland/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - cultures spéciales</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-spezialkulturen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fe7c18e2-87d3-464f-a22e-7cc03e61d480"/>
+            <Style>
+                <ows:Title>Climat - cultures spéciales</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-spezialkulturen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-spezialkulturen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-spezialkulturen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - vue d'ensemble</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-typ</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f743a51c-7487-46a5-af16-5bf031edc417"/>
+            <Style>
+                <ows:Title>Climat - vue d'ensemble</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-typ</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-typ_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-typ/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Climat - cultures dérobées</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.klimaeignung-zwischenfruchtbau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=17b0f989-a79e-4837-b5a2-cf38c23a662c"/>
+            <Style>
+                <ows:Title>Climat - cultures dérobées</ows:Title>
+                <ows:Identifier>ch.blw.klimaeignung-zwischenfruchtbau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.klimaeignung-zwischenfruchtbau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.klimaeignung-zwischenfruchtbau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Régime pluviométrique</ows:Title>
+            <ows:Abstract>La carte établie à l'échelle 1:200 000 reflète, une appréciation générale des conditions climatiques et des restrictions à l'égard de l'agriculture, subdivisées en vingt catégories d'aptitudes. Son but est de souligner les différences sensibles relatives aux possibilités de culture propres aux diverses régions.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.niederschlagshaushalt</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=0335f9f0-b0b1-4925-9c9d-d530ed2dd1cf"/>
+            <Style>
+                <ows:Title>Régime pluviométrique</ows:Title>
+                <ows:Identifier>ch.blw.niederschlagshaushalt</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.niederschlagshaushalt_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.niederschlagshaushalt/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Vignobles en pente</ows:Title>
+            <ows:Abstract>Afin que la difficulté des conditions de production et de vie dans l’agriculture soit équitablement prise en compte, des contributions pour des terrains en pente sont versées pour les surfaces donnant droit aux paiements directs. Pour les paiements directs, deux jeux de géodonnées ont été créés : un sur les terrains en pente (OGéo 152.1 ; OPD art. 43) et un sur les vignobles en pente (OGéo 152.2 ; DZV art. 45). Plusieurs classes de déclivité sont prises en compt [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.steil_terrassenlagen_rebbau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c3e162d0-512b-4baa-ae0f-0d4bd7418ad7"/>
+            <Style>
+                <ows:Title>Vignobles en pente</ows:Title>
+                <ows:Identifier>ch.blw.steil_terrassenlagen_rebbau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.steil_terrassenlagen_rebbau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121231</Default>
+                <Value>20121231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.steil_terrassenlagen_rebbau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IGP produits à base de viande</ows:Title>
+            <ows:Abstract>Le registre des appellations d’origine (AOP) et des indications géographiques (IGP) sert à protéger les noms géographiques et les dénominations traditionnelles qui désignent des produits agricoles (autres que le vin) dont l’identité et les principales caractéristiques sont déterminées par leur origine. Lorsqu’un nom est protégé, son utilisation est réservée aux producteurs de l’aire géographique définie, pour autant qu’ils respectent un cahier des charges détail [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.ursprungsbezeichnungen-fleisch</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d8a34a75-b1c3-4387-8b03-63dd150f529b"/>
+            <Style>
+                <ows:Title>IGP produits à base de viande</ows:Title>
+                <ows:Identifier>ch.blw.ursprungsbezeichnungen-fleisch</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.ursprungsbezeichnungen-fleisch_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110805</Default>
+                <Value>20110805</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.ursprungsbezeichnungen-fleisch/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>AOP fromage</ows:Title>
+            <ows:Abstract>Le registre des appellations d’origine (AOP) et des indications géographiques (IGP) sert à protéger les noms géographiques et les dénominations traditionnelles qui désignent des produits agricoles (autres que le vin) dont l’identité et les principales caractéristiques sont déterminées par leur origine. Lorsqu’un nom est protégé, son utilisation est réservée aux producteurs de l’aire géographique définie, pour autant qu’ils respectent un cahier des charges détail [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.ursprungsbezeichnungen-kaese</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2109a970-681d-4efb-9fd5-6f7da5ae0e14"/>
+            <Style>
+                <ows:Title>AOP fromage</ows:Title>
+                <ows:Identifier>ch.blw.ursprungsbezeichnungen-kaese</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.ursprungsbezeichnungen-kaese_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.ursprungsbezeichnungen-kaese/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>IGP Pâtisserie</ows:Title>
+            <ows:Abstract>Le registre des appellations d’origine (AOP) et des indications géographiques (IGP) sert à protéger les noms géographiques et les dénominations traditionnelles qui désignent des produits agricoles (autres que le vin) dont l’identité et les principales caractéristiques sont déterminées par leur origine. Lorsqu’un nom est protégé, son utilisation est réservée aux producteurs de l’aire géographique définie, pour autant qu’ils respectent un cahier des charges détail [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.ursprungsbezeichnungen-konditoreiwaren</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=0652c964-e9d5-4c4a-8efe-5043f48b457f"/>
+            <Style>
+                <ows:Title>IGP Pâtisserie</ows:Title>
+                <ows:Identifier>ch.blw.ursprungsbezeichnungen-konditoreiwaren</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.ursprungsbezeichnungen-konditoreiwaren_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150306</Default>
+                <Value>20150306</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.ursprungsbezeichnungen-konditoreiwaren/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>AOP Produits végétaux</ows:Title>
+            <ows:Abstract>Le registre des appellations d’origine (AOP) et des indications géographiques (IGP) sert à protéger les noms géographiques et les dénominations traditionnelles qui désignent des produits agricoles (autres que le vin) dont l’identité et les principales caractéristiques sont déterminées par leur origine. Lorsqu’un nom est protégé, son utilisation est réservée aux producteurs de l’aire géographique définie, pour autant qu’ils respectent un cahier des charges détail [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.ursprungsbezeichnungen-pflanzen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=199c9078-9da7-4a77-b811-b342adc2a116"/>
+            <Style>
+                <ows:Title>AOP Produits végétaux</ows:Title>
+                <ows:Identifier>ch.blw.ursprungsbezeichnungen-pflanzen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.ursprungsbezeichnungen-pflanzen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.ursprungsbezeichnungen-pflanzen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>AOP spiritueux</ows:Title>
+            <ows:Abstract>Le registre des appellations d’origine (AOP) et des indications géographiques (IGP) sert à protéger les noms géographiques et les dénominations traditionnelles qui désignent des produits agricoles (autres que le vin) dont l’identité et les principales caractéristiques sont déterminées par leur origine. Lorsqu’un nom est protégé, son utilisation est réservée aux producteurs de l’aire géographique définie, pour autant qu’ils respectent un cahier des charges détail [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.blw.ursprungsbezeichnungen-spirituosen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=bc34236a-ffe9-40af-9eae-d2cf1e0e96e6"/>
+            <Style>
+                <ows:Title>AOP spiritueux</ows:Title>
+                <ows:Identifier>ch.blw.ursprungsbezeichnungen-spirituosen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.blw.ursprungsbezeichnungen-spirituosen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081024</Default>
+                <Value>20081024</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.blw.ursprungsbezeichnungen-spirituosen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Plans des zones d’urgence</ows:Title>
+            <ows:Abstract>Les plans des zones d’urgence au voisinage des installations nucléaires montrent le classement des communes aux alentours des centrales nucléaires dans les zones 1 et 2.L'IFSN élabore et entretient les plans de zones selon l'article 3, par. 4 de l' ordonnance sur la protection en cas d’urgence au voisinage des installations nucléaires (SR 732.33).La zone 1 couvre l’aire proche de l’installation nucléaire où une défaillance grave peut causer un danger [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.ensi.zonenplan-notfallschutz-kernanlagen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=60e40dd3-a00b-4b34-a9c6-8813f21711b9"/>
+            <Style>
+                <ows:Title>Plans des zones d’urgence</ows:Title>
+                <ows:Identifier>ch.ensi.zonenplan-notfallschutz-kernanlagen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.ensi.zonenplan-notfallschutz-kernanlagen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120101</Default>
+                <Value>20120101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.ensi.zonenplan-notfallschutz-kernanlagen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>CadastralWebMap</ows:Title>
+            <ows:Abstract>La base est un service de représentation (Web Map Service), créé depuis les données du Géoportail de la MO de la Confédération, dont le contenu est toutefois réduit par rapport aux données complètes de la mensuration officielle (MO).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.kantone.cadastralwebmap-farbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=cf93dfb6-ffff-43ce-bd9b-271baba2d217"/>
+            <Style>
+                <ows:Title>CadastralWebMap</ows:Title>
+                <ows:Identifier>ch.kantone.cadastralwebmap-farbe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.kantone.cadastralwebmap-farbe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Current>true</Current>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts20.geo.admin.ch/1.0.0/ch.kantone.cadastralwebmap-farbe/default/{Time}/21781/{TileMatrix}/{TileCol}/{TileRow}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Pro Natura: Réserves forestières</ows:Title>
+            <ows:Abstract>Pro Natura gère plus de 4000 ha de forêt dans des réserves forestières. Ces dernières font partie des réserves naturelles de Pro Natura parmi lesquelles d'autres types de milieux sont protégés. Il s'agit de forêts qui sont complètement laissées à la nature, ou au sein desquelles les formes d'utilisation traditionnelles et les mesures mises en œuvre sont favorables à la biodiversité. Ainsi, la diversité des habitats, avec leur flore et leur faune, y e [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.pronatura.waldreservate</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8a69330f-c6db-4c56-bedc-d244542ad86c"/>
+            <Style>
+                <ows:Title>Pro Natura: Réserves forestières</ows:Title>
+                <ows:Identifier>ch.pronatura.waldreservate</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.pronatura.waldreservate_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150624</Default>
+                <Value>20150624</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.pronatura.waldreservate/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Epaisseur des roches meubles</ows:Title>
+            <ows:Abstract>Les formes du relief actuel de la Suisse s’expliquent largement par l’action des glaciations (Quaternaire : ~2,4 millions d’années jusqu’à nos jours). Cette période est marquée par des changements climatiques importantes, et par plusieurs avancées des glaciers jusque loin le piémont, des deux côtés des Alpes. Les vallums morainiques, les terrasses de kames, les drumlins, les chenaux d’eau de fonte, les accumulations de gravier de même que les blocs erratiques so [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.sgpk.maechtigkeit-lockergesteine</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8097719b-8fca-49be-bfd5-e0916be08848"/>
+            <Style>
+                <ows:Title>Epaisseur des roches meubles</ows:Title>
+                <ows:Identifier>ch.sgpk.maechtigkeit-lockergesteine</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.sgpk.maechtigkeit-lockergesteine_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120918</Default>
+                <Value>20120918</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.sgpk.maechtigkeit-lockergesteine/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MN95 Maillage triangulaire</ows:Title>
+            <ows:Abstract>Le maillage triangulaire au niveau de la mensuration nationale (FINELTRA-MN) a été achevé dans les années 90 et a permis de transformer des géodonnées MN03 vers MN95, et réciproquement, avec une précision de l'ordre du décimètre. Ce maillage a été consolidé de manière systématique par les cantons ces dernières années, puis assemblé par swisstopo en 2006 en un jeu de données nommé CHENyx06. Avec CHENyx06, des géodonnées peuvent être transformées avec une préc [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.dreiecksvermaschung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fb7fe701-04b1-4a0c-ba3a-90dbc5bd23d3"/>
+            <Style>
+                <ows:Title>MN95 Maillage triangulaire</ows:Title>
+                <ows:Identifier>ch.swisstopo.dreiecksvermaschung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.dreiecksvermaschung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20061231</Default>
+                <Value>20061231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.dreiecksvermaschung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>AGNES</ows:Title>
+            <ows:Abstract>Au lieu de mettre à diposition des utilisateurs le nouveau cadre de référence MN95 de manière classique à travers les coordonnées sur des protocoles de points, il est possible de réaliser MN95 au moyen de stations GNSS permanentes stables. A partir de cette hypothèse est né le réseau automatique GNSS Suisse (AGNES).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.fixpunkte-agnes</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d2152a5b-3c64-4a4a-abf5-0ae342f2f108"/>
+            <Style>
+                <ows:Title>AGNES</ows:Title>
+                <ows:Identifier>ch.swisstopo.fixpunkte-agnes</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.fixpunkte-agnes_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140924</Default>
+                <Value>20140924</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.fixpunkte-agnes/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Points fixes altimétriques PFA1</ows:Title>
+            <ows:Abstract>Les points de mensuration constituent la base de toutes les données à référence spatiale. L’utilisation des points dits fixes est recommandée pour tous les travaux techniques nécessitant des mesures fiables et précises d’ouvrages. Par point fixe altimétrique, on entend un point matérialisé de façon durable à l'aide d'une cheville dont l'altitude est connue. La mensuration nationale (swisstopo) est responsable des points fixes altimétriques de premièr [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.fixpunkte-hfp1</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1ca6ef94-7204-424c-b2a6-d73158305df6"/>
+            <Style>
+                <ows:Title>Points fixes altimétriques PFA1</ows:Title>
+                <ows:Identifier>ch.swisstopo.fixpunkte-hfp1</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.fixpunkte-hfp1_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121212</Default>
+                <Value>20121212</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_18</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.fixpunkte-hfp1/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Points fixes altimétriques PFA2</ows:Title>
+            <ows:Abstract>Les points de mensuration constituent la base de toutes les données à référence spatiale. L’utilisation des points dits fixes est recommandée pour tous les travaux techniques nécessitant des mesures fiables et précises d’ouvrages. Par point fixe altimétrique, on entend un point matérialisé de façon durable à l'aide d'une cheville dont l'altitude est connue. Les points fixes de catégorie 2 (PFA2) et 3 (PFA3) servent à densifier le réseau de points nat [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.fixpunkte-hfp2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=06044c35-4164-41c6-a4df-297749c03227"/>
+            <Style>
+                <ows:Title>Points fixes altimétriques PFA2</ows:Title>
+                <ows:Identifier>ch.swisstopo.fixpunkte-hfp2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.fixpunkte-hfp2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121212</Default>
+                <Value>20121212</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_18</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.fixpunkte-hfp2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Points fixes planimétriques PFP1</ows:Title>
+            <ows:Abstract>Les points de mensuration constituent la base de toutes les données à référence spatiale. L’utilisation des points dits fixes est recommandée pour tous les travaux techniques nécessitant des mesures fiables et précises d’ouvrages. Par point fixe planimétrique, on entend un point matérialisé de façon durable à l'aide d'une borne ou d'une cheville (parfois située dans un regard) dont les coordonnées et éventuellement l'altitude sont connues. La men [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.fixpunkte-lfp1</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7a49183b-9766-40dd-936c-fb09fdded185"/>
+            <Style>
+                <ows:Title>Points fixes planimétriques PFP1</ows:Title>
+                <ows:Identifier>ch.swisstopo.fixpunkte-lfp1</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.fixpunkte-lfp1_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121212</Default>
+                <Value>20121212</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_18</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.fixpunkte-lfp1/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Points fixes planimétriques PFP2</ows:Title>
+            <ows:Abstract>Les points de mensuration constituent la base de toutes les données à référence spatiale. L’utilisation des points dits fixes est recommandée pour tous les travaux techniques nécessitant des mesures fiables et précises d’ouvrages. Par point fixe planimétrique, on entend un point matérialisé de façon durable à l'aide d'une borne ou d'une cheville (parfois située dans un regard) dont les coordonnées et éventuellement l'altitude sont connues. Les po [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.fixpunkte-lfp2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=12ee04c7-b38d-4809-b417-ce304df6c7cc"/>
+            <Style>
+                <ows:Title>Points fixes planimétriques PFP2</ows:Title>
+                <ows:Identifier>ch.swisstopo.fixpunkte-lfp2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.fixpunkte-lfp2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121212</Default>
+                <Value>20121212</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_18</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.fixpunkte-lfp2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Géoïde en CH1903</ows:Title>
+            <ows:Abstract>Modèle du géoïde de la Suisse de la version de 2004 (CHGeo2004) dans le système de référence CH1903. Le modèle forme la surface zéro de référence (proche du niveau moyen des mers) pour la détermination des altitudes. Il permet la transformation entre des hauteurs ellipsoïdales et des altitudes orthométriques (RAN95). Les altitudes du géoïde sont enregistrées sur une grille de résolution 1 x 1 km et sont interpolées par la méthode biquadratique. Le modèle est dis [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geoidmodell-ch1903</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2b20aece-5cb1-41f1-a618-7c6e1ff6a81b"/>
+            <Style>
+                <ows:Title>Géoïde en CH1903</ows:Title>
+                <ows:Identifier>ch.swisstopo.geoidmodell-ch1903</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geoidmodell-ch1903_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20041231</Default>
+                <Value>20041231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geoidmodell-ch1903/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Géoïde en ETRS89</ows:Title>
+            <ows:Abstract>Modèle du géoïde de la Suisse de la version de 2004 (CHGeo2004) dans le système de référence ETRS89. Le modèle forme la surface zéro de référence (proche du niveau moyen des mers) pour la détermination des altitudes. Il permet la transformation entre des hauteurs ellipsoïdales et des altitudes orthométriques (RAN95). Les altitudes du géoïde sont enregistrées sur une grille de résolution 30 x 30 secondes et sont interpolées par la méthode biquadratique. Le modèle [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geoidmodell-etrs89</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8454f7d9-e3f2-4cc7-be6d-a82196660ccd"/>
+            <Style>
+                <ows:Title>Géoïde en ETRS89</ows:Title>
+                <ows:Identifier>ch.swisstopo.geoidmodell-etrs89</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geoidmodell-etrs89_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20041231</Default>
+                <Value>20041231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geoidmodell-etrs89/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Radiation terrestre</ows:Title>
+            <ows:Abstract>Les sols et les roches renferment des éléments naturels instables, comme l’uranium, le thorium et le potassium, qui émettent un rayonnement radioactif en se désintégrant. La majeure partie du rayonnement mesuré en surface provient des 30 à 40 cm supérieurs du sol. Le débit de dose radioactive terrestre est enregistré à un mètre de hauteur et il est exprimé en nanosieverts par heure (nSv/h). En Suisse, on trouve des lithologies riches en uranium, thorium et potas [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-dosisleistung-terrestrisch</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=eccbc751-9928-4221-89e1-1184cbb3aff5"/>
+            <Style>
+                <ows:Title>Radiation terrestre</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-dosisleistung-terrestrisch</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-dosisleistung-terrestrisch_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19961231</Default>
+                <Value>19961231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-dosisleistung-terrestrisch/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Dernier max. glaciaire (vect.) 500</ows:Title>
+            <ows:Abstract>La Carte (GK500-LGM) représente la plus grande extension des glaciers en Suisse lors de la culmination de la dernière période glaciaire, il y a environ 24'000 ans. Elle présente les derniers résultats de la recherche glaciaire avec un rendu cartographique de haute qualité. La formation et la fonte des glaciers permettent de tirer des conclusions sur les changements écologiques dûs au climat durant le passé géologique récent. - Par A. Bini, J.-F. Buoncristian [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-eiszeit-lgm</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=75c2f212-413c-4d55-8a93-c021c8bbfc95"/>
+            <Style>
+                <ows:Title>Dernier max. glaciaire (vect.) 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-eiszeit-lgm</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-eiszeit-lgm_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110318</Default>
+                <Value>20110318</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-eiszeit-lgm/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Dernier max. glaciaire (carte) 500</ows:Title>
+            <ows:Abstract>La carte (GK500-LGM) représente la plus grande extension des glaciers en Suisse lors de la culmination de la dernière période glaciaire, il y a environ 24'000 ans. Elle présente les derniers résultats de la recherche glaciaire avec un rendu cartographique de haute qualité. La formation et la fonte des glaciers permettent de tirer des conclusions sur les changements écologiques dûs au climat durant le passé géologique récent.- Par A. Bini, J.-F. Buoncristiani [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-eiszeit-lgm-raster</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f1455593-7571-48b0-8603-307ec59a6702"/>
+            <Style>
+                <ows:Title>Dernier max. glaciaire (carte) 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-eiszeit-lgm-raster</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-eiszeit-lgm-raster_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081231</Default>
+                <Value>20081231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-eiszeit-lgm-raster/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>GeoCover - données vectorielles</ows:Title>
+            <ows:Abstract>Les jeux de données vectorielles se basent sur les feuilles de l'Atlas géologique Suisse (GA25) lorsque celles-ci sont disponibles en version imprimée. Dans les autres cas, les jeux de données sont digitalisés sur la base d'une compilation de cartes spéciales et d'originaux à différentes échelles, disponibles au Service géologique national.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geocover</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2467ab13-e794-4c13-8c55-59fe276398c5"/>
+            <Style>
+                <ows:Title>GeoCover - données vectorielles</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geocover</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161231</Default>
+                <Value>20161231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geocover/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Anomalies de Bouguer 500</ows:Title>
+            <ows:Abstract>L’accélération de la pesanteur dépend de la position du point de mesure ainsi que des variations latérales des densités du sous-sol. On nomme anomalie de Bouguer la différence entre l’intensité de la pesanteur mesurée en un point donnée de la surface terrestre et la valeur calculée au même point d’un modèle de Terre idéale, dotée d’un croûte homogène. Les calculs des anomalies gravitaires de la croûte terrestre se basent sur la formule internationale de gravité  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geodaesie-bouguer_anomalien</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=618c9697-129f-47c7-830a-7a256b4c2499"/>
+            <Style>
+                <ows:Title>Anomalies de Bouguer 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geodaesie-bouguer_anomalien</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geodaesie-bouguer_anomalien_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110406</Default>
+                <Value>20110406</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geodaesie-bouguer_anomalien/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Anomalies isostatiques 500</ows:Title>
+            <ows:Abstract>En utilisant l’hypothèse de Pratt ou d’Airy, l’anomalie isostatique peut être dérivée. Cette anomalie correspond à la déviation de la flottaison statique de la croûte dans le manteau terrestre supérieure. La déviation tient compte la structure de racine sous la croûte (chaîne de montagnes), mais la forme de structure de racine n’est pas toujours clairement définie. L’hypothèse d’Airy-Heiskanen et les densités suivantes ont été utilisées pour la carte : manteau t [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geodaesie-isostatische_anomalien</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7234896a-842c-4524-8710-5d900953cb1d"/>
+            <Style>
+                <ows:Title>Anomalies isostatiques 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geodaesie-isostatische_anomalien</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geodaesie-isostatische_anomalien_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19791231</Default>
+                <Value>19791231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geodaesie-isostatische_anomalien/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Géologie 500</ows:Title>
+            <ows:Abstract>La carte géologique de la Suisse au 1:500`000 (GK500-Geol) donne un aperçu des couches géologiques superficielles de tout le territoire suisse et des régions limitrophes. Elle donne un aperçu des couches géologiques superficielles. Il s’agit donc d’une importante base de données et d’un outil aidant à mieux comprendre notre environnement dans l’optique d`un développement durable. C’est un auxiliaire indispensable pour la formation dans les domaines des sciences  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geologische_karte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ca917a71-dcc9-44b6-8804-823c694be516"/>
+            <Style>
+                <ows:Title>Géologie 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geologische_karte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geologische_karte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20080630</Default>
+                <Value>20080630</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geologische_karte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Atlas géologique AG25</ows:Title>
+            <ows:Abstract>Les feuilles de l'Atlas géologique de la Suisse (AG25) fournissent des renseignements détaillés sur les couches superficielles du sous-sol. Les formations géologiques sont représentées au moyen de couleurs, et de figurés en fonction de leur âge, de la nature de leurs substances et de leurs relations stratigraphiques (tectonique). Chaque feuille de l'atlas est publiée avec une notice explicative décrivant les formations et les particularités géologiques d [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geologischer_atlas</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=258814a5-8fcf-47df-b0c6-160602b0078c"/>
+            <Style>
+                <ows:Title>Atlas géologique AG25</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geologischer_atlas</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geologischer_atlas_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131120</Default>
+                <Value>20131120</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geologischer_atlas/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Aéromagnétique Plateau/Jura 500</ows:Title>
+            <ows:Abstract>La magnétisation d’une roche est produite par la magnétisation induite par le champ terrestre et par la magnétisation rémanente produite par le champ terrestre lors de la formation de la roche. Les déviations locales ou régionales du champ magnétique terrestre, appelées anomalies, par rapport à un modèle global peuvent être mesurées à l’aide de levés fait par avion. Ces anomalies peuvent permettre la mise en évidence de structures géologiques ou tectoniques ains [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_jura</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f952b9be-9a11-478c-a21c-9d5e8631c7c2"/>
+            <Style>
+                <ows:Title>Aéromagnétique Plateau/Jura 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_jura</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-aeromagnetische_karte_jura_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19831231</Default>
+                <Value>19831231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-aeromagnetische_karte_jura/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Aéromagnétique 500</ows:Title>
+            <ows:Abstract>La magnétisation d’une roche est produite par la magnétisation induite par le champ terrestre et par la magnétisation rémanente produite par le champ terrestre lors de la formation de la roche. Les déviations locales ou régionales du champ magnétique terrestre, appelées anomalies, par rapport à un modèle global peuvent être mesurées à l’aide de levés fait par avion. Ces anomalies peuvent permettre la mise en évidence de structures géologiques ou tectoniques ains [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_schweiz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4cc706a2-0005-4cc6-8326-7b944a1d5b05"/>
+            <Style>
+                <ows:Title>Aéromagnétique 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_schweiz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-aeromagnetische_karte_schweiz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120628</Default>
+                <Value>20120628</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-aeromagnetische_karte_schweiz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Déclinaison 500</ows:Title>
+            <ows:Abstract>Les cartes géomagnétiques découlent des mesures des éléments de l’intensité totale, de la déclinaison et de l’inclinaison. La déclinaison est l’écart du nord magnétique par rapport au nord géographique. Du fait que le champ magnétique terrestre varie en fonction du temps les cartes géomagnétiques ne se réfèrent qu’à une époque donnée. Elles peuvent être adaptées à l’aide de formules correctives dont les coefficients sont déterminés expérimentalement.- Carte papi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-deklination</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=8f38b25f-f984-450a-ae48-02290e82136c"/>
+            <Style>
+                <ows:Title>Déclinaison 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-deklination</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-deklination_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20011203</Default>
+                <Value>20011203</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-deklination/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Densité de flux thermique 500</ows:Title>
+            <ows:Abstract>La carte géothermique rend compte de l’énergie thermique produite dans le sous-sol qui traverse 1 m2 de surface terrestre. Un grand partie de la chaleur est libérée par des processus de désintégration radioactive qui se déroulent dans la mince croûte terrestre (~30 km). En Suisse, le flux de chaleur moyen est ~90 mW/m2. Le flux de chaleur est le plus élevé dans le nord de la Suisse, et il est le plus faible dans l’arc alpin et dans le Jura. Les écartes sont géné [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-geothermie</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2d8174b2-8c4a-44ea-b470-cb3f216b90d1"/>
+            <Style>
+                <ows:Title>Densité de flux thermique 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-geothermie</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-geothermie_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20111121</Default>
+                <Value>20111121</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-geothermie/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Inclinaison 500</ows:Title>
+            <ows:Abstract>Les cartes géomagnétiques découlent des mesures des éléments de l’intensité totale, de la déclinaison et de l’inclinaison. L’inclinaison est l’angle entre le champ magnétique et la surface de la Terre. Du fait que le champ magnétique terrestre varie en fonction du temps les cartes géomagnétiques ne se réfèrent qu’à une époque donnée. Elles peuvent être adaptées à l’aide de formules correctives dont les coefficients sont déterminés expérimentalement.- Carte papie [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-inklination</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=639c0536-bfea-44d3-b088-ed7b6b43cde9"/>
+            <Style>
+                <ows:Title>Inclinaison 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-inklination</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-inklination_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20111128</Default>
+                <Value>20111128</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-inklination/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Intensité champ magnétique 500</ows:Title>
+            <ows:Abstract>Les cartes géomagnétiques découlent des mesures des éléments de l’intensité totale, de la déclinaison et de l’inclinaison. Le champ magnétique terrestre est défini à l’aide d’un vecteur représenté par sa direction et son intensité (nT). Du fait que le champ magnétique terrestre varie en fonction du temps les cartes géomagnétiques ne se réfèrent qu’à une époque donnée. Elles peuvent être adaptées à l’aide de formules correctives dont les coefficients sont détermi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geophysik-totalintensitaet</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=132d9ff6-92de-4c02-87a7-72df26bcb33e"/>
+            <Style>
+                <ows:Title>Intensité champ magnétique 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geophysik-totalintensitaet</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geophysik-totalintensitaet_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19800101</Default>
+                <Value>19800101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geophysik-totalintensitaet/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte géotechnique 200</ows:Title>
+            <ows:Abstract>Dans la carte géotechnique 1:200'000 (GK200) le sous-sol est classé par critères lithologiques-pétrographiques. La légende est conçue pour servir à l'utilisation technique du sous-sol (extraction de ressources minérales, projets de construction). Les points superposés indiquent les carrières de roches meubles et cohérentes ainsi que les usines de traitement. Les cartes suivantes sont disponibles: Feuille 1, Neuchâtel-Bern-Basel (1964); Feuille 2, Luzern- [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk200</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=6dd16d72-047b-4489-91dc-b36eeabf972e"/>
+            <Style>
+                <ows:Title>Carte géotechnique 200</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk200</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-gk200_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19670101</Default>
+                <Value>19670101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-gk200/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Origine des roches 500</ows:Title>
+            <ows:Abstract>La carte géotechnique 1:500'000 (GK500) de la Commission Géotechnique Suisse (SGTK) montre le sous-sol selon des critères lithologiques pétrographiques. La légende est conçu pour répondre à l'utilisation technique du sous-sol (extraction de ressources minérales, constructions). Dans cette représentation, les roches sont subdivisées en groupes en fonction de leur mode de formation (genèse), p. ex. dépôts fluviatiles et glaciaires, roches résultant de la s [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-genese</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=65652bdd-76e3-4df2-9329-140a04a2a66c"/>
+            <Style>
+                <ows:Title>Origine des roches 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-genese</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-gk500-genese_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20060304</Default>
+                <Value>20060304</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-gk500-genese/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Classification des roches 500</ows:Title>
+            <ows:Abstract>La carte géotechnique 1:500'000 (GK500) de la Commission Géotechnique Suisse (SGTK) montre le sous-sol selon des critères lithologiques pétrographiques. La légende est conçu pour répondre à l'utilisation technique du sous-sol (extraction de ressources minérales, constructions). Une classification sommaire permet de distinguer trois types de roches: roches meubles, roches sédimentaires et roches cristallines.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-gesteinsklassierung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f2c81b93-f0c5-4899-83a9-974ce36c48e6"/>
+            <Style>
+                <ows:Title>Classification des roches 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-gesteinsklassierung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-gk500-gesteinsklassierung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20060304</Default>
+                <Value>20060304</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-gk500-gesteinsklassierung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Lithologie (Groupes) 500</ows:Title>
+            <ows:Abstract>La carte géotechnique 1:500'000 (GK500) de la Commission Géotechnique Suisse (SGTK) montre le sous-sol selon des critères lithologiques pétrographiques. La légende est conçu pour répondre à l'utilisation technique du sous-sol (extraction de ressources minérales, constructions). Dans la vue d'ensemble, les roches sont subdivisées en 25 groupes selon leur genèse, leur composition minéralogique, leur granulométrie et leur degré de cristallisation.</ows: [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-lithologie_hauptgruppen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=435522fb-599e-41c0-a7c0-49d922ea6acf"/>
+            <Style>
+                <ows:Title>Lithologie (Groupes) 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-gk500-lithologie_hauptgruppen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-gk500-lithologie_hauptgruppen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20060304</Default>
+                <Value>20060304</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-gk500-lithologie_hauptgruppen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mat. premières minérales 200</ows:Title>
+            <ows:Abstract>Dans la carte des matières premières minérales 1:200'000 (RK200), le sous-sol est classé selon des critères géo-chimiques. Des données de type point sont superposées sur des gisements de minerai y c. des informations sur le type de minéralisation, morphologie, importance et degrès de relevé.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d86f291c-49b8-4bc8-93f7-dbab48dcb26c"/>
+            <Style>
+                <ows:Title>Mat. premières minérales 200</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19900101</Default>
+                <Value>19900101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Pierres des monuments hist.</ows:Title>
+            <ows:Abstract>La base de données reprend le fichier du même nom de Francis de Quervain, assemblé en 1954–1983. Cette oeuvre comprend env. 2’400 pages avec 10’000 fiches sur les roches et pierres appliquées à 4’000 monuments et d’autres objets isolés. On peut considérer cette collection comme représentative pour les applications historiques de pierre en construction et sculpture en Suisse.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotechnik-steine_historische_bauwerke</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=efe1b3cf-dac4-4660-a5bd-a9269a3d97db"/>
+            <Style>
+                <ows:Title>Pierres des monuments hist.</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotechnik-steine_historische_bauwerke</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotechnik-steine_historische_bauwerke_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130620</Default>
+                <Value>20130620</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotechnik-steine_historische_bauwerke/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Géotopes suisses</ows:Title>
+            <ows:Abstract>Les géotopes sont des monuments naturels géoscientifiques. Certains d'entre eux, qui témoignent de l'histoire de la Terre, nous racontent l'évolution du paysage, du climat et de la vie, la genèse et la disparition des montagnes, ainsi que la formation des roches. D'autres géotopes nous révèle des processus qui se déroulent à la surface ou à l'intérieur de la Terre. Les géotopes incluent également le monde caché des cavernes et des nappes d&#3 [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geotope</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e7dd54e9-fc98-4e5c-b46a-694d1ba6c84e"/>
+            <Style>
+                <ows:Title>Géotopes suisses</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geotope</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geotope_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20130107</Default>
+                <Value>20130107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geotope/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sentiers géologiques</ows:Title>
+            <ows:Abstract>Le géotourisme met en valeur des particularités géologiques et paysagères. Les sentiers géologiques permettent à tout un chacun d’appréhender les processus géologiques et géomorphologiques sur le terrain. La Plate-forme Géosciences de l’Académie suisse des sciences naturelles (SCNAT) et « Géologie Vivante » ont compilé une liste des sentiers géologiques de Suisse.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-geowege</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=3356602e-23d5-4e42-9d75-55fe9cc2daba"/>
+            <Style>
+                <ows:Title>Sentiers géologiques</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-geowege</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-geowege_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120903</Default>
+                <Value>20120903</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-geowege/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Atlas gravimétrique 100</ows:Title>
+            <ows:Abstract>Les anomalies de Bouguer sont représentées sur 22 feuilles couvrant l’ensemble du territoire suisse. On nomme anomalie de Bouguer la différence entre l’intensité de la pesanteur mesurée en un point donnée de la surface terrestre et la valeur calculée au même point d’un modèle de Terre idéale, dotée d’un croûte homogène. Les calculs des anomalies gravitaires de la croûte terrestre se basent sur la formule internationale de gravité de 1967. L'incidence de la t [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-gravimetrischer_atlas</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=732cb247-8307-4cc7-8c31-b1c505a94633"/>
+            <Style>
+                <ows:Title>Atlas gravimétrique 100</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-gravimetrischer_atlas</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-gravimetrischer_atlas_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20021231</Default>
+                <Value>20021231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-gravimetrischer_atlas/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Points de mesure gravim. 100</ows:Title>
+            <ows:Abstract>Un réseau des points de mesure de la pesanteur avec une densité de 0.5 point par kilomètre carré couvrant l’ensemble du territoire suisse a permis l'élaboration des cartes de Bouguer à haute résolution (échelles 1:100000 et 1:500000). On nomme anomalie de Bouguer la différence entre l’intensité de la pesanteur mesurée en un point donnée de la surface terrestre et la valeur calculée au même point d’un modèle de Terre idéale, dotée d’un croûte homogène. Les ca [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-gravimetrischer_atlas.messpunkte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=297a1958-3636-45af-a17c-e90120605132"/>
+            <Style>
+                <ows:Title>Points de mesure gravim. 100</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-gravimetrischer_atlas.messpunkte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-gravimetrischer_atlas.messpunkte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150731</Default>
+                <Value>20150731</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-gravimetrischer_atlas.messpunkte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réservoirs aquifères 500</ows:Title>
+            <ows:Abstract>L’Office fédéral de l’environnement OFEV est l’office compétent du Service géologique national pour l'hydrogéologie. La Carte hydrogéologique 1:500'000 est dans la série GéoCartes (GK500) et composée de deux feuilles. La première (GK500-Hydro) est consacrée aux réservoirs aquifères et fournit des informations sur leur productivité. La seconde (GK500-Hydro_Vul) traite de la vulnérabilité de ces réservoirs et de leur sensibilité à des menaces possibles par [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservorkommen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f198f6f6-8efa-4235-a55f-99767ea0206c"/>
+            <Style>
+                <ows:Title>Réservoirs aquifères 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservorkommen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-hydrogeologische_karte-grundwasservorkommen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081103</Default>
+                <Value>20081103</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-hydrogeologische_karte-grundwasservorkommen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Vulnérabilité des aquifères 500</ows:Title>
+            <ows:Abstract>L’Office fédéral de l’environnement OFEV est l’office compétent du Service géologique national pour l’hydrogéologie. La Carte hydrogéologique 1:500'000 est dans la série GéoCartes (GK500) et composée de deux feuilles. La première (GK500-Hydro) est consacrée aux réservoirs aquifères et fournit des informations sur leur productivité. La seconde (GK500-Hydro_Vul) traite de la vulnérabilité de ces réservoirs et de leur sensibilité à des menaces possibles par des [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservulnerabilitaet</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b8efde6b-7323-4496-aa70-b976ec55cec9"/>
+            <Style>
+                <ows:Title>Vulnérabilité des aquifères 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservulnerabilitaet</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-hydrogeologische_karte-grundwasservulnerabilitaet_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20081016</Default>
+                <Value>20081016</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-hydrogeologische_karte-grundwasservulnerabilitaet/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Découpage cartes géologiques spéciales Raster</ows:Title>
+            <ows:Abstract>Les cartes géologiques spéciales (GSK) existent dans des échelles entre le 1:25000 et le 1:100000. Leur délimitation a été choisie dans une perspective géographique ou thématique; elles renseignent sur les conditions géologiques régionales et mettent en lumière des priorités thématiques choisies. Un auxiliaire important pour les géologues, les ingénieurs, les aménagistes, les services officiels, les scientifiques et les écoles. Actuellement, non toutes les feuil [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-spezialkarten_schweiz.metadata</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5a7e79b5-0aef-4514-9df4-62fb92edee97"/>
+            <Style>
+                <ows:Title>Découpage cartes géologiques spéciales Raster</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-spezialkarten_schweiz.metadata</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-spezialkarten_schweiz.metadata_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110101</Default>
+                <Value>20110101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-spezialkarten_schweiz.metadata/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Tectonique 500</ows:Title>
+            <ows:Abstract>La Carte tectonique de la Suisse (GK500-Tekto) illustre les unités tectoniques et des éléments structuraux de tout le territoire suisse et des régions avoisinantes. Elle est un excellent outil pour la découverte géologique de la Suisse et pour une bonne compréhension de son environnement. Elle constitue aussi un auxiliaire indispensable pour la formation dans les domaines des sciences de la terre et de l`environnement.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.geologie-tektonische_karte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=a4cdef47-505e-41ab-b6a7-ad5b92d80e41"/>
+            <Style>
+                <ows:Title>Tectonique 500</ows:Title>
+                <ows:Identifier>ch.swisstopo.geologie-tektonische_karte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20080522</Default>
+                <Value>20080522</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.geologie-tektonische_karte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Classes de pente plus de 30°</ows:Title>
+            <ows:Abstract>Représentation dérivée du modèle altimétrique numérique swissALTI3D et ceux de France, d'Italie, d'Autriche et d'Allemagne qui permet d'identifier les pentes de plus de 30°. Cette information est utile à la prévention des accidents d'avalanche. Les pentes de plus de 30° sont classées en 4 catégories selon les recommandations de l'institut pour l'étude de la neige et des avalanches SLF. La pente représente la première dérivée d'un  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.hangneigung-ueber_30</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=77f0637f-8d52-45bc-b824-d6e5719de55b"/>
+            <Style>
+                <ows:Title>Classes de pente plus de 30°</ows:Title>
+                <ows:Identifier>ch.swisstopo.hangneigung-ueber_30</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.hangneigung-ueber_30_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+                <Value>20130101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.hangneigung-ueber_30/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte Dufour Première édition</ows:Title>
+            <ows:Abstract>Entre 1844 et 1864, la première série de cartes officielles de la Suisse a été publiée à l'échelle 1:100'000 sous la direction du général Henri-Guillaume Dufour. Dufour a été également le fondateur et le premier directeur du Bureau topographique fédéral qu'il établit à Genève en 1838. Les 25 feuilles de la « carte Dufour » ne comportaient qu'une couleur et utilisaient le mode de reproduction de la gravure sur cuivre. Une fois la première édition  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.hiks-dufour</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d12f970f-6a83-4c33-8cfe-7504b6a5dca9"/>
+            <Style>
+                <ows:Title>Carte Dufour Première édition</ows:Title>
+                <ows:Identifier>ch.swisstopo.hiks-dufour</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>18650101</Default>
+                <Value>18650101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.hiks-dufour/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte Siegfried Première édition</ows:Title>
+            <ows:Abstract>L'Atlas topographique de la Suisse a été publié entre 1870 et 1926, initialement sous la direction du colonel Hermann Siegfried. Cest la première carte d'ensemble détaillée de la Suisse à l'échelle 1:25'000 pour le Plateau central, le Jura et le sud du Tessin et, au 1:50'000, pour les Alpes. Au total, si l'on tient compte de la mise à jour périodique effectuée jusqu'en 1949, plus de 4000 feuilles mises à jour ont été publiées. Deux te [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.hiks-siegfried</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d3b21424-70a4-4984-a693-aa7f11813c53"/>
+            <Style>
+                <ows:Title>Carte Siegfried Première édition</ows:Title>
+                <ows:Identifier>ch.swisstopo.hiks-siegfried</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19260101</Default>
+                <Value>19260101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.hiks-siegfried/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Pente plus de 30°</ows:Title>
+            <ows:Abstract>Représentation dérivée du modèle altimétrique numérique swissALTI3D et ceux de France, d'Italie, d'Autriche et d'Allemagne qui permet d'identifier les pentes de plus de 30°. Cette information est utile à la prévention des accidents d'avalanche. La pente représente la première dérivée d'un modèle altimétrique numérique. Elle a été calculée sur un modèle altimétrique numérique avec une résolution de 10m combinant swissALTI3D pour la Suisse  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo-karto.hangneigung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c37cbfbf-0d87-4ae8-8c21-8932130eb3fa"/>
+            <Style>
+                <ows:Title>Pente plus de 30°</ows:Title>
+                <ows:Identifier>ch.swisstopo-karto.hangneigung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo-karto.hangneigung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+                <Value>20151202</Value>
+                <Value>20081107</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo-karto.hangneigung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MN95 Changements de coordonnées</ows:Title>
+            <ows:Abstract>Les changements de coordonnées entre l'ancien cadre de référence MN03 et le nouveau MN95, respectivement les déformations de MN03, sont mises en évidence par rapport à Zimmerwald (BE): les plus grandes modifications de coordonnées d'environ 1.5 m apparaissent dans le sud du Tessin et dans la vallée de Poschiavo (GR). Les différences les plus faibles se situent aux environs de Berne, puisque tant MN03 que MN95 ont leur origine à l'ancien observatoire  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.koordinatenaenderung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=d749d5c4-d362-489b-a6c1-a8ee68aeeaab"/>
+            <Style>
+                <ows:Title>MN95 Changements de coordonnées</ows:Title>
+                <ows:Identifier>ch.swisstopo.koordinatenaenderung</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.koordinatenaenderung_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20061231</Default>
+                <Value>20061231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.koordinatenaenderung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:10'000 (couleur)</ows:Title>
+            <ows:Abstract>La carte nationale 1:10'000 est la carte topographique de plus grande échelle produite par swisstopo. Elle représente avec un grand niveau de détails les réseaux de transport, les localités, le terrain, la végétation, ainsi que des écritures encore plus denses. Le contenu est complété avec la représentation des rochers et du relief. Le périmètre de la carte comprend le territoire Suisse et la principauté du Liechtenstein. La mise à jour est faite annuellemen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.landeskarte-farbe-10</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=cb0f8401-c49a-4bdf-aff6-40a7015ba43a"/>
+            <Style>
+                <ows:Title>Carte nationale 1:10'000 (couleur)</ows:Title>
+                <ows:Identifier>ch.swisstopo.landeskarte-farbe-10</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.landeskarte-farbe-10_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.landeskarte-farbe-10/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:10'000 (grise)</ows:Title>
+            <ows:Abstract>La carte nationale 1:10'000 est la carte topographique de plus grande échelle produite par swisstopo. Elle représente avec un grand niveau de détails les réseaux de transport, les localités, le terrain, la végétation, ainsi que des écritures encore plus denses. Le contenu est complété avec la représentation des rochers et du relief. Le périmètre de la carte comprend le territoire Suisse et la principauté du Liechtenstein. La mise à jour est faite annuellemen [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.landeskarte-grau-10</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b495f369-9262-4269-8532-27b06591e33a"/>
+            <Style>
+                <ows:Title>Carte nationale 1:10'000 (grise)</ows:Title>
+                <ows:Identifier>ch.swisstopo.landeskarte-grau-10</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.landeskarte-grau-10_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.landeskarte-grau-10/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau de base gravimétrique</ows:Title>
+            <ows:Abstract>Stations actuelles du réseau gravimétrique national. Ces stations sont observées régulièrement et servent comme points de référence pour des projets gravimétriques.La base de ce réseau est formée par les stations absolues qui sont densifiées par des mesures relatives sur des points fixes de la mensuration nationale.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.landesschwerenetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=95879cd4-e93d-4d4d-af57-4ec6731b9c97"/>
+            <Style>
+                <ows:Title>Réseau de base gravimétrique</ows:Title>
+                <ows:Identifier>ch.swisstopo.landesschwerenetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.landesschwerenetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150731</Default>
+                <Value>20150731</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.landesschwerenetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Déviations de la verticale</ows:Title>
+            <ows:Abstract>La déviation de la verticale est l'angle entre la verticale du champ de pesanteur et la perpendiculaire de l'ellipsoïde de référence. Cet angle peut atteindre des valeurs jusqu'à 1 minute d'arc et doit être considéré pour corriger des mesures géodésiques précises. Cet angle est formé de deux composantes sud-nord (Xi) et ouest-est (Eta). La déviation de la verticale est une information très importante pour la détermination du géoïde.On peut observ [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lotabweichungen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ef5df57e-8eb3-4b55-96e5-0e70adead7ad"/>
+            <Style>
+                <ows:Title>Déviations de la verticale</ows:Title>
+                <ows:Identifier>ch.swisstopo.lotabweichungen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lotabweichungen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160606</Default>
+                <Value>20160606</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lotabweichungen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:1 million | CN1000</ows:Title>
+            <ows:Abstract>La carte nationale au 1:1 million est une carte topographique synoptique de la Suisse et de l'Europe centrale à petite échelle: La Suisse et les régions limitrophes de Lyon à Salzbourg et de Strasbourg à Gênes sur une carte au format très pratique. L'état de mise à jour est actuellement de 2011. La carte nationale au 1:1 million est disponible sous forme analogique (carte papier) et digitale (Swiss Map Raster). L'édition imprimée est disponible soit  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk1000.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4ea228b8-7910-4339-8a31-d38d8d8592bd"/>
+            <Style>
+                <ows:Title>Carte nationale 1:1 million | CN1000</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk1000.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk1000.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk1000.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:100'000 | CN100</ows:Title>
+            <ows:Abstract>La carte nationale au 1:100'000 est la carte topographique suisse supra régionale. Le périmètre total est divisé en 23 feuilles. Il existe également des assemblages pour certaines régions d'intérêt géographique ou touristique. La mise à jour s'effectue par secteur suivant un cycle de 6 ans. La carte nationale au 1:100'000 est disponible sous forme analogique (carte papier) et digitale (Swiss Map Raster). Les feuilles de l'édition imprimée son [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk100.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e8be74b0-fc58-4fc7-be9a-5dcc70dcea6e"/>
+            <Style>
+                <ows:Title>Carte nationale 1:100'000 | CN100</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk100.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk100.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk100.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:200'000 | CN200</ows:Title>
+            <ows:Abstract>La carte nationale au 1:200'000 est une carte topographique synoptique précise de la Suisse. Le périmètre total est divisé en 4 feuilles. La mise à jour s'effectue suivant un cycle de 4 ans. La carte nationale au 1:200'000 est disponible sous forme analogique (carte papier) et digitale (Swiss Map Raster). Les feuilles de l'édition imprimée sont disponibles soit pliées, soit à plat. La Swiss Map Raster est la carte nationale digitalisée, livrable  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk200.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5f75341e-2050-4ed9-a8de-ee7637490565"/>
+            <Style>
+                <ows:Title>Carte nationale 1:200'000 | CN200</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk200.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk200.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk200.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:25'000 | CN25</ows:Title>
+            <ows:Abstract>La carte nationale au 1:25'000 est la carte topographique suisse avec une représentation très détaillée des voies de communications, des surfaces bâties, de l'hydrographie, du terrain et de la végétation. Le périmètre total est divisé en 247 feuilles. La mise à jour s'effectue par secteur suivant un cycle de 6 ans. La carte nationale au 1:25'000 est disponible sous forme analogique (carte papier) et digitale (Swiss Map Raster).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk25.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2987a492-a097-46f3-b162-abc1b3115f85"/>
+            <Style>
+                <ows:Title>Carte nationale 1:25'000 | CN25</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk25.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk25.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk25.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:500'000 | CN500</ows:Title>
+            <ows:Abstract>La carte nationale au 1:500'000 est une carte topographique synoptique de la Suisse. La mise à jour s'effectue suivant un cycle de 6 ans. La carte nationale au 1:500'000 est disponible sous forme analogique (carte papier) et digitale (Swiss Map Raster). L'édition imprimée est disponible soit pliée, soit à plat. La Swiss Map Raster est la carte nationale digitalisée, livrable sous forme de données raster géoréférencées (format TIF). Les informatio [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk500.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e1825425-2988-493e-9206-080171cadd27"/>
+            <Style>
+                <ows:Title>Carte nationale 1:500'000 | CN500</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk500.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk500.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk500.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte nationale 1:50'000 | CN50</ows:Title>
+            <ows:Abstract>La carte nationale au 1:50’000 est la carte topographique suisse avec une représentation détaillée des voies de communications, des surfaces bâties, de l’hydrographie, du terrain et de la végétation. Le périmètre total est divisé en 78 feuilles. Il existe également des assemblages pour certaines régions d’intérêt géographique ou touristique. La mise à jour s’effectue par secteur suivant un cycle de 6 ans. La carte nationale au 1:50’000 est disponible sous forme  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk50.noscale</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4c8c7c58-61c7-4a61-8e7a-6ffb95d183df"/>
+            <Style>
+                <ows:Title>Carte nationale 1:50'000 | CN50</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe-pk50.noscale</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.pixelkarte-farbe-pk50.noscale_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe-pk50.noscale/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>swissALTI3D estompage du relief</ows:Title>
+            <ows:Abstract>Représentation dérivée du modèle altimétrique numérique swissALTI3D qui permet de visualiser le relief de la Suisse et de la Principauté de Liechtenstein. L’estompage du relief représente l’illumination d’une surface pour une position donnée du soleil. L’estompage de relief de swissALTI3D a été calculé avec la position solaire suivante : azimut 315° (nord-ouest), hauteur 45°.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissalti3d-reliefschattierung</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1964cc81-5298-460f-9228-41120315bea8"/>
+            <Style>
+                <ows:Title>swissALTI3D estompage du relief</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissalti3d-reliefschattierung</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_22</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissalti3d-reliefschattierung/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Limites de district</ows:Title>
+            <ows:Abstract>swissBOUNDARIES3D limites de district comprend les limites administratives des districts des cantons suisses. Le district est une subdivision administrative entre la commune et le canton. Les cantons de Genève, Uri, Obwalden, Nidwalden, Glarus, Zug, Basel-Stadt et Appenzell Innerrhoden ne sont pas divisés en districts. swissBOUNDARIES3D limites de district est dérivé du jeu de données swissBOUNDARIES3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissboundaries3d-bezirk-flaeche.fill</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e1b8837d-8c19-4b65-a8b5-21aaff44fa91"/>
+            <Style>
+                <ows:Title>Limites de district</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissboundaries3d-bezirk-flaeche.fill</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swissboundaries3d-bezirk-flaeche.fill_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissboundaries3d-bezirk-flaeche.fill/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Limites de commune</ows:Title>
+            <ows:Abstract>swissBOUNDARIES3D limites de commune comprend les limites administratives des communes de la Suisse et de la Principauté de Liechtenstein. La commune est la plus petite unité administrative. swissBOUNDARIES3D limites de commune est dérivé du jeu de données swissBOUNDARIES3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9961dc6c-20a9-4b16-8a24-b20c3d8ddb83"/>
+            <Style>
+                <ows:Title>Limites de commune</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Limites cantonales</ows:Title>
+            <ows:Abstract>swissBOUNDARIES3D limites cantonales comprend les limites administratives entre les cantons suisses. La Suisse est formée de 26 cantons, qui ont le statut d'États fédérés.swissBOUNDARIES3D limites cantonales est dérivé du jeu de données swissBOUNDARIES3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissboundaries3d-kanton-flaeche.fill</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=9eee6d40-f0a6-46c9-94ad-69679b9f3d38"/>
+            <Style>
+                <ows:Title>Limites cantonales</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissboundaries3d-kanton-flaeche.fill</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swissboundaries3d-kanton-flaeche.fill_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissboundaries3d-kanton-flaeche.fill/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Frontières nationales</ows:Title>
+            <ows:Abstract>swissBOUNDARIES3D frontières nationales comprend la frontière de la Suisse et de la Principauté de Liechtenstein. swissBOUNDARIES3D frontières nationales est dérivé du jeu de données swissBOUNDARIES3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissboundaries3d-land-flaeche.fill</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c5bd42e6-033f-4d43-a398-320b42538798"/>
+            <Style>
+                <ows:Title>Frontières nationales</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissboundaries3d-land-flaeche.fill</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swissboundaries3d-land-flaeche.fill_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170101</Default>
+                <Value>20170101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissboundaries3d-land-flaeche.fill/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Les bâtiments en 3D simplifiés</ows:Title>
+            <ows:Abstract>swissBUILDINGS3D 1.0 est un jeu de données de bâtiments en 3D couvrant la Suisse et la Principauté du Liechtenstein (FL) et convenant pour un large éventail de modélisations et de visualisations. Ce jeu de données a été généré à partir des éléments de base de VECTOR25 que sont les contours des bâtiments et les surfaces boisées. Les hauteurs des bâtiments et leurs altitudes sont déduites du modèle numérique de surface (MNS), respectivement du modèle numérique de  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissbuildings3d</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4d4544b1-d57b-4ccc-b69d-582198286692"/>
+            <Style>
+                <ows:Title>Les bâtiments en 3D simplifiés</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissbuildings3d</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swissbuildings3d_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19980101</Default>
+                <Value>19980101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissbuildings3d/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>SWISSIMAGE</ows:Title>
+            <ows:Abstract>La mosaïque d'orthophoto SWISSIMAGE est un assemblage d'images aériennes numériques en couleur. Une orthophoto est une image aérienne dont les influences de l'inclinaison de la chambre de prise de vue et du relief du terrain sont neutralisées. La mosaïque SWISSIMAGE présente ainsi une échelle et une radiométrie uniformes sur l'ensemble de la Suisse.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissimage-product</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=db5a52b4-0f5f-4998-a9a8-dd9539f93809"/>
+            <Style>
+                <ows:Title>SWISSIMAGE</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissimage-product</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissimage-product/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Noms géographiques swissNAMES3D</ows:Title>
+            <ows:Abstract>swissNAMES3D est le recueil de noms géographiques le plus complet de la Suisse et la Principauté du Liechtenstein. swissNAMES3D comprend plus de 300'000 entrées géoréférencées réparties en différentes catégories. Le jeu de données remplace dès 2015 le produit SwissNames basé sur les noms de la Carte nationale et mis à jour jusqu'en 2008. Dans le géoportail fédéral, la couche "noms géographiques" correspond à une sélection de swissNAMES3D en fonct [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissnames3d</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ab24e5cc-7f53-451a-820a-f113fa545943"/>
+            <Style>
+                <ows:Title>Noms géographiques swissNAMES3D</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissnames3d</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+                <Value>20150101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_24</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissnames3d/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte swissTLM (couleur)</ows:Title>
+            <ows:Abstract>swissTLM-Map est une carte générée entièrement automatiquement qui offre un complément aux cartes nationales pour les échelles de 1:5'000 à 1:10'000 environ. swissTLM-Map est basé sur les données du modèle topographique du paysage swissTLM3D complétées par des courbes de niveau et un ombrage du relief tirés du modèle numérique de terrain swissALTI3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swisstlm3d-karte-farbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b353f39c-6349-49e0-97d0-c522fc2fbf0f"/>
+            <Style>
+                <ows:Title>Carte swissTLM (couleur)</ows:Title>
+                <ows:Identifier>ch.swisstopo.swisstlm3d-karte-farbe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swisstlm3d-karte-farbe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swisstlm3d-karte-farbe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte swissTLM (grise)</ows:Title>
+            <ows:Abstract>swissTLM-Map est une carte générée entièrement automatiquement qui offre un complément aux cartes nationales pour les échelles de 1:5'000 à 1:10'000 environ. swissTLM-Map est basé sur les données du modèle topographique du paysage swissTLM3D complétées par des courbes de niveau et un ombrage du relief tirés du modèle numérique de terrain swissALTI3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swisstlm3d-karte-grau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ea59f826-b408-4657-a393-6fec178b2e30"/>
+            <Style>
+                <ows:Title>Carte swissTLM (grise)</ows:Title>
+                <ows:Identifier>ch.swisstopo.swisstlm3d-karte-grau</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swisstlm3d-karte-grau_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swisstlm3d-karte-grau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Chemins de randonnée pédestre</ows:Title>
+            <ows:Abstract>swissTLM3D chemins de randonnée pédestre comprend les chemins de randonnée officiels de la Suisse et de la Principauté de Liechtenstein. Le jeu de données est publié en collaboration avec l'Office fédéral des routes OFROU, SuisseMobile, Suisse Rando et les cantons. swissTLM3D chemins de randonnée pédestre fait partie du jeu de données swissTLM3D.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swisstlm3d-wanderwege</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4a064664-a346-4c1a-b424-4e8a0f0b56cb"/>
+            <Style>
+                <ows:Title>Chemins de randonnée pédestre</ows:Title>
+                <ows:Identifier>ch.swisstopo.swisstlm3d-wanderwege</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.swisstlm3d-wanderwege_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swisstlm3d-wanderwege/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MN95 Précision de transformation</ows:Title>
+            <ows:Abstract>A partir de la carte de précision combinée, il est possible de déterminer la précision des données GNSS mesurées, par ex. avec le service de positionnement swipos, en MN03 (avec real-time-FINELTRA) ou en MN95, par rapport aux données de la mensuration nationale et du cadastre (cadre de référence). Une adaptation locale n’est en outre pas requise dans les zones de tensions négligeables. Pour plus d’informations concernant l’utilisation de cette carte de précision [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.transformationsgenauigkeit</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=579e0ecf-6700-4652-81f5-bf0e28f2fcd6"/>
+            <Style>
+                <ows:Title>MN95 Précision de transformation</ows:Title>
+                <ows:Identifier>ch.swisstopo.transformationsgenauigkeit</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.transformationsgenauigkeit_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161022</Default>
+                <Value>20161022</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.transformationsgenauigkeit/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>NPA et localités</ows:Title>
+            <ows:Abstract>L’article 24 de l’ordonnance sur les noms géographiques (ONGéo) confie à l’Office fédéral de topographie swisstopo la tâche d’établir, de gérer et de publier le nouveau répertoire officiel des localités avec le code postal et le périmètre associés à chacune d’elles. La tenue de ce jeu de données qui correspond à l’exception de la suppression de l’identifiant «IDENT NPA, Chiffres_supplementaires» de la table «NPA»du TOPIC «NPA_Localite» de la mensuration officiel [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo-vd.ortschaftenverzeichnis_plz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=972cd117-f1ed-4818-be14-233d89ab9fdf"/>
+            <Style>
+                <ows:Title>NPA et localités</ows:Title>
+                <ows:Identifier>ch.swisstopo-vd.ortschaftenverzeichnis_plz</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131101</Default>
+                <Value>20131101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo-vd.ortschaftenverzeichnis_plz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Zones de tensions négligeables</ows:Title>
+            <ows:Abstract>Dans le cas de travaux de terrain réalisés pour la mensuration officielle, un ajustage local doit systématiquement être exécuté sauf si la preuve peut être apporté qu’il peut y être renoncé. Un tel ajustage local est superflu dans les zones où les tensions sont négligeables parce que la précision géométrique satisfait à des critères de qualité très élevés. Dans la pratique quotidienne, la connaissance des zones où les tensions sont négligeables facilite l’emploi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo-vd.spannungsarme-gebiete</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=c8b1a15e-b4db-49b0-ad3a-5b113c072fca"/>
+            <Style>
+                <ows:Title>Zones de tensions négligeables</ows:Title>
+                <ows:Identifier>ch.swisstopo-vd.spannungsarme-gebiete</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo-vd.spannungsarme-gebiete_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20161022</Default>
+                <Value>20161022</Value>
+                <Value>20151101</Value>
+                <Value>20141101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo-vd.spannungsarme-gebiete/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Sites protégés VECTOR200</ows:Title>
+            <ows:Abstract>Limites administratives: limites des sites protégés de la Suisse et de l'étranger.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-adminboundaries-protectedarea</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=37c78660-531a-404c-86f8-8cdde0c3d985"/>
+            <Style>
+                <ows:Title>Sites protégés VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-adminboundaries-protectedarea</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-adminboundaries-protectedarea_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-adminboundaries-protectedarea/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bâtiments gén. VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Buildings comprend les bâtiments isolés. Il est composé d'une feature class. Les bâtiments saisis représentent, du fait de la forte généralisation liée à l'échelle, en réalité souvent des groupes de bâtiments. Le Topic Buildings ne sert par conséquent pas à l'identification de bâtiments isolés mais représente plutôt un moyen d'orientation auxiliaire.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-building</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fca926e5-99ee-4cc2-bec4-778a5f1ebda5"/>
+            <Style>
+                <ows:Title>Bâtiments gén. VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-building</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-building_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-building/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Hydrologie VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Hydrography contient les différents éléments en rapport avec les eaux. Il comprend six feature classes et une table. Les lignes de "FlowingWater" et "StagnantWater" et les points de "GWK_FW_Node" sont liés topologiquement selon une structure de type arcs – noeuds, dans laquelle les arcs (lignes) sont reliés entre eux par des noeuds (points). Chaque arc a ainsi exactement deux noeuds, un par extrémité. Les arcs et les noeuds forme [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-hydrography</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f22843ce-ee17-43b3-adc8-ad7015043984"/>
+            <Style>
+                <ows:Title>Hydrologie VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-hydrography</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-hydrography_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-hydrography/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Couverture prim. sol VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Landcover décrit la couverture du sol. Il est composé d'une feature class. Les surfaces forment un réseau de surface dans lequel des vides et des superpositions particulières sont autorisées.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-landcover</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=cfbd4793-4225-4743-942b-d9b97acfbfcc"/>
+            <Style>
+                <ows:Title>Couverture prim. sol VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-landcover</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-landcover_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-landcover/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Surfaces boisées</ows:Title>
+            <ows:Abstract>Le Topic Landcover décrit la couverture du sol. Ce sont les surfaces boisées qui sont représentées dans cet extrait.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-landcover-wald</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=de52b509-87c7-4f7e-be0b-ff3c557d2949"/>
+            <Style>
+                <ows:Title>Surfaces boisées</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-landcover-wald</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-landcover-wald_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-landcover-wald/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Objets marquants VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Miscellaneous comprend une sélection d'objets ponctuels et linéaires marquants ainsi que des cotes d'altitude. Il est composé de cinq feature classes.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-miscellaneous</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2ba45ce9-b062-4792-95ba-9bbc8d840652"/>
+            <Style>
+                <ows:Title>Objets marquants VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-miscellaneous</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-miscellaneous_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-miscellaneous/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Cotes d'altitude VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Miscellaneous comprend une sélection d'objets ponctuels et linéaires marquants ainsi que des cotes d'altitude. Il est composé de cinq feature classes. Feature Class GeodPoint Cotes d'altitude</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-miscellaneous-geodpoint</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e93697f6-2c2a-4774-94ea-bb95d17aba6e"/>
+            <Style>
+                <ows:Title>Cotes d'altitude VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-miscellaneous-geodpoint</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-miscellaneous-geodpoint_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-miscellaneous-geodpoint/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Noms VECTOR200</ows:Title>
+            <ows:Abstract>Le Topic Names est composé d’une feature class NamedLocation qui contient les noms de communes, de localités, de sommets et de nombreux autres types de noms d’importance à l’échelle 1 :200'000</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-names-namedlocation</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=4af350f6-2df1-4b5b-947f-6d65aea528f8"/>
+            <Style>
+                <ows:Title>Noms VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-names-namedlocation</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-names-namedlocation_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-names-namedlocation/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Transports publics VECTOR200</ows:Title>
+            <ows:Abstract>Les Transports publics, sont une partie du topic Transportation qui décrit les différents éléments liés aux transports (réseau routier, réseau ferroviaire, aéroports, bacs pour voiture, etc.). Il est composé de 12 feature classes et de 4 tables. Les lignes et les points sont liés topologiquement selon une structure de type arcs – noeuds dans laquelle les arcs (lignes) sont reliés entre eux par des noeuds (points). Chaque arc a ainsi exactement deux noeuds, un pa [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-transportation-oeffentliche-verkehr</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=dbcb87f1-3704-4eb6-8bd4-efed536bbf56"/>
+            <Style>
+                <ows:Title>Transports publics VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-transportation-oeffentliche-verkehr</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-transportation-oeffentliche-verkehr_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-transportation-oeffentliche-verkehr/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau routier VECTOR200</ows:Title>
+            <ows:Abstract>"Le réseau routier, est une partie du topic Transportation du produit VECTOR200 de swisstopo, qui présente les divers éléments en rapport avec le Trafic / Transport. Il présente des informations à propos des: Bureaux de douane (CustomsOffice), Noeuds routiers importants (Interchange), Rampes d'accès aux routes (Ramp), Routes et sentiers (Road), Bacs pour voitures (ship) et Informations sur le trafic routier.VECTOR200 est un modèle bidimensionnel du terri [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec200-transportation-strassennetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2816b787-2508-42c8-8dec-094d68f5f094"/>
+            <Style>
+                <ows:Title>Réseau routier VECTOR200</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec200-transportation-strassennetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec200-transportation-strassennetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160101</Default>
+                <Value>20160101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec200-transportation-strassennetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Surfaces aménagées VECTOR25</ows:Title>
+            <ows:Abstract>La couche Surfaces aménagées (abréviation anl) contient les catégories d'objets gare, aire d'aéroport et gare d'aéroport.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-anlagen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=67047f47-13d7-491a-bb7e-bb2c8016582d"/>
+            <Style>
+                <ows:Title>Surfaces aménagées VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-anlagen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-anlagen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-anlagen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Objets isolés VECTOR25</ows:Title>
+            <ows:Abstract>La couche thématique Objets isolés (abréviation eob) contient une sélection d'objets marquants figurant sous forme de points et de lignes (aides à l'orientation).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-einzelobjekte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5fb1376e-554a-4bcc-9c1d-e0b9b39d7aaa"/>
+            <Style>
+                <ows:Title>Objets isolés VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-einzelobjekte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-einzelobjekte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19980101</Default>
+                <Value>19980101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-einzelobjekte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau ferroviaire VECTOR25</ows:Title>
+            <ows:Abstract>La couche thématique Réseau ferroviaire (abréviation eis) contient toutes les lignes de chemins de fer figurant sur la Carte nationale 1:25'000. Les chemins de fer forment un réseau de lignes: les voies convergeant à un aiguillage ou se ramifiant possèdent un noeud commun ce qui permet d'effectuer une planification de routes.Les tronçons de chemins de fer qui passent dans des tunnels ou sur des ponts ont un attribut correspondant.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-eisenbahnnetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=399bc7a4-6b59-4568-821e-10c1dd13415c"/>
+            <Style>
+                <ows:Title>Réseau ferroviaire VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-eisenbahnnetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-eisenbahnnetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-eisenbahnnetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bâtiments VECTOR25</ows:Title>
+            <ows:Abstract>La couche Bâtiments (abréviation geb) comprend l'ensemble des bâtiments figurant sur la carte nationale 1:25'000. La classification des bâtiments, représentés sous forme de surfaces, correspond aux catégories d'objets figurant sur la légende de la carte</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-gebaeude</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=112c4f0e-0755-44bb-bdb0-249e9c56f8bb"/>
+            <Style>
+                <ows:Title>Bâtiments VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-gebaeude</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-gebaeude_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-gebaeude/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau hydrographique VECTOR25</ows:Title>
+            <ows:Abstract>La couche réseau hydrographique contient un réseau de lignes orientées, reliées entre elles par des noeuds, ainsi qu'une table sans géométrie. Pour les territoires de la Suisse et de la Principauté de Liechtenstein, ces éléments constituent la base du système d'information des eaux de Suisse - GEWISS- géré par l'Office fédéral de l'environnement (OFEV). Dans le cadre du projet GWN07, la couche réseau hydrographique a été profondément remaniée. De [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-gewaessernetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=0351bc2e-3cdc-4e8a-b422-0142e494e7b4"/>
+            <Style>
+                <ows:Title>Réseau hydrographique VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-gewaessernetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-gewaessernetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-gewaessernetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Haies, arbres isolés VECTOR25</ows:Title>
+            <ows:Abstract>La couche Haies et arbres isolés (abréviation heb) contient des objets-points et des objets-lignes appartenant à la végétation. Les objets sont saisis de manière semi-automatique à partir de la carte pixel.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-heckenbaeume</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=664aacf5-91f8-43b1-a6b4-f01eca6cc082"/>
+            <Style>
+                <ows:Title>Haies, arbres isolés VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-heckenbaeume</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-heckenbaeume_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>19980101</Default>
+                <Value>19980101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-heckenbaeume/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Surfaces primaires VECTOR25</ows:Title>
+            <ows:Abstract>La couche Surfaces primaires (abréviation pri) décrit la couverture du sol. Les différents types de surface de cette couche (lac et forêt) se délimitent réciproquement et forment un réseau de surfaces sans redondance et sans lacune. Contrairement à la Carte nationale, la couche Surfaces primaires présente les zones d'habitation sous la forme de surface (interprétée). Les bâtiments isolés sont proposés en tant que couche thématique séparée. Les objets-lignes  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-primaerflaechen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fb4c7281-bd58-4aae-b86a-3a73ba82e0aa"/>
+            <Style>
+                <ows:Title>Surfaces primaires VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-primaerflaechen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-primaerflaechen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-primaerflaechen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Réseau routier VECTOR25</ows:Title>
+            <ows:Abstract>La couche Réseau routier (abréviation str) de VECTOR25 comprend le réseau complet des routes et des chemins figurant sur la Carte nationale 1:25'000. La classification (catégories d'objet) correspond à la légende de la carte. Pour cette raison, en régions frontalières allemande et française, la classification étrangère est conservée (p.ex. Wirtweg ou route étroite). Les routes constituent un réseau de lignes: les tronçons (arcs) qui se croisent au même n [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-strassennetz</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=993a3d7d-070d-4992-92cb-ef82d2853661"/>
+            <Style>
+                <ows:Title>Réseau routier VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-strassennetz</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-strassennetz_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-strassennetz/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Autres transports VECTOR25</ows:Title>
+            <ows:Abstract>Les moyens de transport (téléski, bacs, téléphériques, etc.) n'appartenant pas aux couches Réseau routier et Réseau ferroviaire sont englobés dans la couche thématique Autres moyens de transport (abréviation uvk) sous forme d'objets-lignes.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.vec25-uebrigerverkehr</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=721be44e-0ead-48e9-94e5-725c42749a77"/>
+            <Style>
+                <ows:Title>Autres transports VECTOR25</ows:Title>
+                <ows:Identifier>ch.swisstopo.vec25-uebrigerverkehr</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.vec25-uebrigerverkehr_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20090401</Default>
+                <Value>20090401</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.vec25-uebrigerverkehr/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MN95 Vecteurs de déformation PAT1</ows:Title>
+            <ows:Abstract>Les vecteurs de déformations indiquent la direction et la grandeur de la correction locale (info-box) lors du passage de MN03 à MN95 au niveau des points PAT1.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.verschiebungsvektoren-tsp1</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=b7630e06-7e06-4ab0-9ed5-9fd2e66b6433"/>
+            <Style>
+                <ows:Title>MN95 Vecteurs de déformation PAT1</ows:Title>
+                <ows:Identifier>ch.swisstopo.verschiebungsvektoren-tsp1</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.verschiebungsvektoren-tsp1_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20061231</Default>
+                <Value>20061231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.verschiebungsvektoren-tsp1/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>MN95 Vecteurs de déformation PAT2</ows:Title>
+            <ows:Abstract>Les vecteurs de déformations indiquent la direction et la grandeur de la correction locale (infobox) lors du passage de MN03 à MN95 au niveau des points PAT2.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.verschiebungsvektoren-tsp2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=fcd80c13-8824-4c3b-835b-95172eb9e4e6"/>
+            <Style>
+                <ows:Title>MN95 Vecteurs de déformation PAT2</ows:Title>
+                <ows:Identifier>ch.swisstopo.verschiebungsvektoren-tsp2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.verschiebungsvektoren-tsp2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070101</Default>
+                <Value>20070101</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.verschiebungsvektoren-tsp2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Voyage dans le temps - Cartes</ows:Title>
+            <ows:Abstract>Depuis sa fondation en 1838 par Guillaume-Henri Dufour, l’Office fédéral de topographie swisstopo a produit trois séries de cartes officielles : la Carte topographique de la Suisse 1:100’000 (carte Dufour), l’Atlas topographique de la Suisse 1:25’000 / 1:50’000 (Carte Siegfried) et les Cartes nationales suisses en différentes échelles. L’ensemble de ces fonds constitue un bien culturel d’importance nationale qui peut être qualifié de « mémoire du paysage de la S [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.zeitreihen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=22287cd6-b75b-4caf-9413-aa3f196548b2"/>
+            <Style>
+                <ows:Title>Voyage dans le temps - Cartes</ows:Title>
+                <ows:Identifier>ch.swisstopo.zeitreihen</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/png</Format>
+            <Format>image/pngjpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20131231</Default>
+                <Value>20131231</Value>
+                <Value>20121231</Value>
+                <Value>20111231</Value>
+                <Value>20101231</Value>
+                <Value>20091231</Value>
+                <Value>20081231</Value>
+                <Value>20071231</Value>
+                <Value>20061231</Value>
+                <Value>20051231</Value>
+                <Value>20041231</Value>
+                <Value>20031231</Value>
+                <Value>20021231</Value>
+                <Value>20011231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19901231</Value>
+                <Value>19891231</Value>
+                <Value>19881231</Value>
+                <Value>19871231</Value>
+                <Value>19861231</Value>
+                <Value>19851231</Value>
+                <Value>19841231</Value>
+                <Value>19831231</Value>
+                <Value>19821231</Value>
+                <Value>19811231</Value>
+                <Value>19801231</Value>
+                <Value>19791231</Value>
+                <Value>19781231</Value>
+                <Value>19771231</Value>
+                <Value>19761231</Value>
+                <Value>19751231</Value>
+                <Value>19741231</Value>
+                <Value>19731231</Value>
+                <Value>19721231</Value>
+                <Value>19711231</Value>
+                <Value>19701231</Value>
+                <Value>19691231</Value>
+                <Value>19681231</Value>
+                <Value>19671231</Value>
+                <Value>19661231</Value>
+                <Value>19651231</Value>
+                <Value>19641231</Value>
+                <Value>19631231</Value>
+                <Value>19621231</Value>
+                <Value>19611231</Value>
+                <Value>19601231</Value>
+                <Value>19591231</Value>
+                <Value>19581231</Value>
+                <Value>19571231</Value>
+                <Value>19561231</Value>
+                <Value>19551231</Value>
+                <Value>19541231</Value>
+                <Value>19531231</Value>
+                <Value>19521231</Value>
+                <Value>19511231</Value>
+                <Value>19501231</Value>
+                <Value>19491231</Value>
+                <Value>19481231</Value>
+                <Value>19471231</Value>
+                <Value>19461231</Value>
+                <Value>19451231</Value>
+                <Value>19441231</Value>
+                <Value>19431231</Value>
+                <Value>19421231</Value>
+                <Value>19411231</Value>
+                <Value>19401231</Value>
+                <Value>19391231</Value>
+                <Value>19381231</Value>
+                <Value>19371231</Value>
+                <Value>19361231</Value>
+                <Value>19351231</Value>
+                <Value>19341231</Value>
+                <Value>19331231</Value>
+                <Value>19321231</Value>
+                <Value>19311231</Value>
+                <Value>19301231</Value>
+                <Value>19291231</Value>
+                <Value>19281231</Value>
+                <Value>19271231</Value>
+                <Value>19261231</Value>
+                <Value>19251231</Value>
+                <Value>19241231</Value>
+                <Value>19231231</Value>
+                <Value>19221231</Value>
+                <Value>19211231</Value>
+                <Value>19201231</Value>
+                <Value>19191231</Value>
+                <Value>19181231</Value>
+                <Value>19171231</Value>
+                <Value>19161231</Value>
+                <Value>19151231</Value>
+                <Value>19141231</Value>
+                <Value>19131231</Value>
+                <Value>19121231</Value>
+                <Value>19111231</Value>
+                <Value>19101231</Value>
+                <Value>19091231</Value>
+                <Value>19081231</Value>
+                <Value>19071231</Value>
+                <Value>19061231</Value>
+                <Value>19051231</Value>
+                <Value>19041231</Value>
+                <Value>19031231</Value>
+                <Value>19021231</Value>
+                <Value>19011231</Value>
+                <Value>19001231</Value>
+                <Value>18991231</Value>
+                <Value>18981231</Value>
+                <Value>18971231</Value>
+                <Value>18961231</Value>
+                <Value>18951231</Value>
+                <Value>18941231</Value>
+                <Value>18931231</Value>
+                <Value>18921231</Value>
+                <Value>18911231</Value>
+                <Value>18901231</Value>
+                <Value>18891231</Value>
+                <Value>18881231</Value>
+                <Value>18871231</Value>
+                <Value>18861231</Value>
+                <Value>18851231</Value>
+                <Value>18841231</Value>
+                <Value>18831231</Value>
+                <Value>18821231</Value>
+                <Value>18811231</Value>
+                <Value>18801231</Value>
+                <Value>18791231</Value>
+                <Value>18781231</Value>
+                <Value>18771231</Value>
+                <Value>18761231</Value>
+                <Value>18751231</Value>
+                <Value>18741231</Value>
+                <Value>18731231</Value>
+                <Value>18721231</Value>
+                <Value>18711231</Value>
+                <Value>18701231</Value>
+                <Value>18691231</Value>
+                <Value>18681231</Value>
+                <Value>18671231</Value>
+                <Value>18661231</Value>
+                <Value>18651231</Value>
+                <Value>18641231</Value>
+                <Value>18631231</Value>
+                <Value>18621231</Value>
+                <Value>18611231</Value>
+                <Value>18601231</Value>
+                <Value>18591231</Value>
+                <Value>18581231</Value>
+                <Value>18571231</Value>
+                <Value>18561231</Value>
+                <Value>18551231</Value>
+                <Value>18541231</Value>
+                <Value>18531231</Value>
+                <Value>18521231</Value>
+                <Value>18511231</Value>
+                <Value>18501231</Value>
+                <Value>18491231</Value>
+                <Value>18481231</Value>
+                <Value>18471231</Value>
+                <Value>18461231</Value>
+                <Value>18451231</Value>
+                <Value>18441231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_23</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.zeitreihen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+                <ResourceURL format="image/pngjpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.zeitreihen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.pngjpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Centres logistiques de l'armée CLA</ows:Title>
+            <ows:Abstract>Cinq centres logistiques de l’armée (CLA) veillent à ce que les troupes de l’Armée suisse obtiennent pour l’instruction et l’engagement les prestations logistiques nécessaires.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.armeelogistikcenter</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=ae538f59-74af-4ed4-999b-66cfb52c36de"/>
+            <Style>
+                <ows:Title>Centres logistiques de l'armée CLA</ows:Title>
+                <ows:Identifier>ch.vbs.armeelogistikcenter</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.armeelogistikcenter_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150330</Default>
+                <Value>20150330</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.armeelogistikcenter/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Stations-service BEBECO</ows:Title>
+            <ows:Abstract>Emplacements des stations-service de la Confédération (BEBECO)</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.bundestankstellen-bebeco</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7f8c99f2-7736-4fe6-8d69-0af201f01526"/>
+            <Style>
+                <ows:Title>Stations-service BEBECO</ows:Title>
+                <ows:Identifier>ch.vbs.bundestankstellen-bebeco</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.bundestankstellen-bebeco_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20170131</Default>
+                <Value>20170131</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.bundestankstellen-bebeco/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte Zeus</ows:Title>
+            <ows:Abstract>Dispositif de base «Zeus» (édition en fac-similé). Carte déclassifiée. Ordre d'engagement de l'armée du 28.4.1989 (valable à partir du 1.1.1990) et du dispositif de base combiné correspondant datant du 31.10.1991 (valable à partir du 1.1.1992).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.grunddispositiv-zeus</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=6441b459-e9c6-41a7-b88d-5529c3b1d003"/>
+            <Style>
+                <ows:Title>Carte Zeus</ows:Title>
+                <ows:Identifier>ch.vbs.grunddispositiv-zeus</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.grunddispositiv-zeus_fr.png" />
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20140116</Default>
+                <Value>20140116</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.grunddispositiv-zeus/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Secteurs logistiques des CLA</ows:Title>
+            <ows:Abstract>Zones de responsabilité des centres logistiques de l'armée (CLA).</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.logistikraeume-armeelogistikcenter</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=270a2032-d346-42c5-a657-9129186f1f08"/>
+            <Style>
+                <ows:Title>Secteurs logistiques des CLA</ows:Title>
+                <ows:Identifier>ch.vbs.logistikraeume-armeelogistikcenter</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.logistikraeume-armeelogistikcenter_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20141217</Default>
+                <Value>20141217</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.logistikraeume-armeelogistikcenter/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Mil Airspace Chart</ows:Title>
+            <ows:Abstract>La carte Mil Airspace Chart est une carte thématique de l'aviation militaire qui a vu le jour en collaboration avec skyguide, swisstopo et les Forces aériennes suisses. Reposant sur la carte aéronautique OACI, elle est taillée sur mesure pour répondre aux besoins des opérations des Forces aériennes suisses. Elle est publiée une fois par an à la date de la modification de la structure de l'espace aérien de la Suisse.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.milairspacechart</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=7cc94b45-7104-4187-92ea-d1f9a1f838ba"/>
+            <Style>
+                <ows:Title>Mil Airspace Chart</ows:Title>
+                <ows:Identifier>ch.vbs.milairspacechart</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.milairspacechart_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_19</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.milairspacechart/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Patrouille des Glaciers (course A)</ows:Title>
+            <ows:Abstract>La Patrouille des Glaciers (PDG) est une course militaire internationale de ski alpinisme de l’Armée Suisse, ouverte également aux patrouilles civiles. La course se déroule de Zermatt à Verbier (Parcours Z) respectivement d'Arolla à Verbier (Parcours A). Elle doit être accomplie en une seule étape.Cette course unique se caractérise par la longueur et l’altitude du profil du parcours ainsi que les exigences du milieu alpin. /</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.patrouilledesglaciers-a_rennen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=30c41be6-0f35-4caa-aeda-45f8705911fb"/>
+            <Style>
+                <ows:Title>Patrouille des Glaciers (course A)</ows:Title>
+                <ows:Identifier>ch.vbs.patrouilledesglaciers-a_rennen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.patrouilledesglaciers-a_rennen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150511</Default>
+                <Value>20150511</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.patrouilledesglaciers-a_rennen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Patrouille des Glaciers (course Z)</ows:Title>
+            <ows:Abstract>La Patrouille des Glaciers (PDG) est une course militaire internationale de ski alpinisme de l’Armée Suisse, ouverte également aux patrouilles civiles. La course se déroule de Zermatt à Verbier (Parcours Z) respectivement d'Arolla à Verbier (Parcours A). Elle doit être accomplie en une seule étape.Cette course unique se caractérise par la longueur et l’altitude du profil du parcours ainsi que les exigences du milieu alpin.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.patrouilledesglaciers-z_rennen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=64d14c1a-25bb-4bf5-bad3-057823a334ef"/>
+            <Style>
+                <ows:Title>Patrouille des Glaciers (course Z)</ows:Title>
+                <ows:Identifier>ch.vbs.patrouilledesglaciers-z_rennen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.patrouilledesglaciers-z_rennen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150508</Default>
+                <Value>20150508</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.patrouilledesglaciers-z_rennen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Postes de rétablissement</ows:Title>
+            <ows:Abstract>Les postes de rétablissement sont responsables de l’adaptation, du remplacement et de l’échange de l’équipement personnel que les militaires possèdent pendant la période de leur service obligatoire.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.retablierungsstellen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=e436f7aa-3d59-4f4e-8940-46d2b181a9b4"/>
+            <Style>
+                <ows:Title>Postes de rétablissement</ows:Title>
+                <ows:Identifier>ch.vbs.retablierungsstellen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.retablierungsstellen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20150615</Default>
+                <Value>20150615</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.retablierungsstellen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Régions territoriales</ows:Title>
+            <ows:Abstract>Les régions territoriales (reg ter) forment le lien avec les autorités civiles et assurent la coopération avec les cantons; Elles sont le point de contact des autorités civiles lorsque ces dernières nécessitent l'appui de l'armée. De plus, les régions territoriales conduisent les engagements de soutien et subsidiaires de sûreté ainsi que les engagements d'aide en cas de catastrophe dans leur secteur et immédiatement au-delà de la frontière sur décisi [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.territorialregionen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f1d7d608-74d7-46fc-a478-b4357409f34b"/>
+            <Style>
+                <ows:Title>Régions territoriales</ows:Title>
+                <ows:Identifier>ch.vbs.territorialregionen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.territorialregionen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110501</Default>
+                <Value>20110501</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.territorialregionen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Carte des dégâts aux forêts</ows:Title>
+            <ows:Abstract>Le programme PROJEKTIL vous permet de visualiser:- les dommages causés aux arbres par des impacts de tirs, y compris les dommages subséquents provoqués par les militaires, et - les places de tir. Grâce à cette visualisation par le biais d'Internet, l'utilisateur dispose d'un outil efficace pour acquérir une vue d'ensemble sur les dégâts occasionnés par des tirs et sur les places de tir. L'objectif, à l'avenir, est de réduire les dégâts et [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.vbs.waldschadenkarte</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=2ff2299e-55b5-4ec7-bb92-fbb06e7ee422"/>
+            <Style>
+                <ows:Title>Carte des dégâts aux forêts</ows:Title>
+                <ows:Identifier>ch.vbs.waldschadenkarte</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.vbs.waldschadenkarte_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20110525</Default>
+                <Value>20110525</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.vbs.waldschadenkarte/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassins versants partiels 2km2</ows:Title>
+            <ows:Abstract>La série de données "Bassins versants 2km2" constitue l’élément central de la série de géodonnées "Bassins versants topographiques des eaux suisses". Elle correspond à une mosaïque de plus de 22 000 bassins versants partiels, délimités en fonction de la topographie et couvrant l’ensemble du territoire suisse. Grâce au codage hiérarchique des bassins, la série peut être aisément intégrée à un SIG et les bassins versants complets reconstitués. Cett [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-teileinzugsgebiete_2</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=6d9c8ba5-2532-46ed-bc26-0a4017787a56"/>
+            <Style>
+                <ows:Title>Bassins versants partiels 2km2</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-teileinzugsgebiete_2</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-teileinzugsgebiete_2_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20121231</Default>
+                <Value>20121231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_25</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-teileinzugsgebiete_2/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Itinéraires convois exceptionnels</ows:Title>
+            <ows:Abstract>Les routes nationales ne correspondent à aucune classe de route normée et ne figurent ainsi pas en tant qu'itinéraire pour convois exceptionnels.Les itinéraires cantonaux pour convois exceptionnels représentent l'état actuel ou les intentions cantonales dans la forme générale, mais ne prennent pas en considération les obstacles concrets sur les routes. Certains cantons possèdent des cartes représentants les obstacles au format électronique. Les paramètre [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.astra.ausnahmetransportrouten</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5aa6303c-71e3-4ca5-ab67-cd913a81a1ee"/>
+            <Style>
+                <ows:Title>Itinéraires convois exceptionnels</ows:Title>
+                <ows:Identifier>ch.astra.ausnahmetransportrouten</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.astra.ausnahmetransportrouten_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20160713</Default>
+                <Value>20160713</Value>
+                <Value>20150211</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.astra.ausnahmetransportrouten/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bassins versants partiels 40km2</ows:Title>
+            <ows:Abstract>La série de données "Bassins versants 40km2" est l’un des quatre niveaux d’agrégation de la série de géodonnées "Bassins versants topographiques des eaux suisses". Elle correspond à une mosaïque d’environ 1200 bassins versants partiels, délimités en fonction de la topographie et couvrant l’ensemble du territoire suisse. Lorsque c’était possible, la subdivision a été harmonisée avec les "bassins versants de base" de l’Atlas hydrologique de [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-teileinzugsgebiete_40</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=102e547e-6210-46ea-9246-123f966ba9be"/>
+            <Style>
+                <ows:Title>Bassins versants partiels 40km2</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-teileinzugsgebiete_40</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-teileinzugsgebiete_40_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120701</Default>
+                <Value>20120701</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-teileinzugsgebiete_40/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Exutoires des bassins versants</ows:Title>
+            <ows:Abstract>La série de données "Exutoires des bassins versants" fait partie de la série de géodonnées "Bassins versants topographiques des eaux suisses". Elle est constituée des objets ponctuels qui constituent les exutoires des quelque 22 000 bassins versants complets possibles et est complétée par toute une série de paramètres décrivant l’utilisation du sol, la géographie physique et les débits moyens annuels et mensuels modélisés. Les exutoires sont les  [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.wasser-gebietsauslaesse</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=1a4d7eee-5135-4895-a255-e1dfd1fd6ff9"/>
+            <Style>
+                <ows:Title>Exutoires des bassins versants</ows:Title>
+                <ows:Identifier>ch.bafu.wasser-gebietsauslaesse</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.wasser-gebietsauslaesse_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20120701</Default>
+                <Value>20120701</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.wasser-gebietsauslaesse/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Images aériennes de privés</ows:Title>
+            <ows:Abstract>Dans le cadre de différents projets de clients privés et publics, des images aériennes de la Suisse sont saisies par différentes entreprises privées. Toutes ces images aériennes sont représentées sous la forme des coordonnées du centre de l'image, de la zone couverte par l'image (footprint) ainsi que par des métadonnées. Les images aériennes peuvent être commandées auprès des entreprises privées concernées.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lubis-luftbilder-dritte-firmen</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f614decc-a4f2-480f-b007-b8d9b99bdde5"/>
+            <Style>
+                <ows:Title>Images aériennes de privés</ows:Title>
+                <ows:Identifier>ch.swisstopo.lubis-luftbilder-dritte-firmen</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lubis-luftbilder-dritte-firmen_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>99991231</Default>
+                <Value>99991231</Value>
+                <Value>20091231</Value>
+                <Value>20081231</Value>
+                <Value>20071231</Value>
+                <Value>20061231</Value>
+                <Value>20051231</Value>
+                <Value>20041231</Value>
+                <Value>20031231</Value>
+                <Value>20021231</Value>
+                <Value>20011231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19901231</Value>
+                <Value>19891231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lubis-luftbilder-dritte-firmen/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Images aér. swisstopo couleur</ows:Title>
+            <ows:Abstract>La collection photographique de swisstopo comprend quelques 500'000 photos aériennes analogiques (en couleur, en infrarouge couleur ou en noir et blanc) et prises de vues terrestres. Environ 320’000 images aériennes sont représentées sous la forme des coordonnées du centre de l'image, de la zone couverte par l'image (footprint) ainsi que par des métadonnées. Environ 160‘000 images de ce fonds sont déjà numérisées et peuvent être visualisées en pleine [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lubis-luftbilder_farbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=352c0302-fac6-455b-bd81-092850a7ad4e"/>
+            <Style>
+                <ows:Title>Images aér. swisstopo couleur</ows:Title>
+                <ows:Identifier>ch.swisstopo.lubis-luftbilder_farbe</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lubis-luftbilder_farbe_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>99991231</Default>
+                <Value>99991231</Value>
+                <Value>20101231</Value>
+                <Value>20091231</Value>
+                <Value>20081231</Value>
+                <Value>20071231</Value>
+                <Value>20061231</Value>
+                <Value>20051231</Value>
+                <Value>20041231</Value>
+                <Value>20031231</Value>
+                <Value>20021231</Value>
+                <Value>20011231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19901231</Value>
+                <Value>19891231</Value>
+                <Value>19881231</Value>
+                <Value>19871231</Value>
+                <Value>19861231</Value>
+                <Value>19851231</Value>
+                <Value>19841231</Value>
+                <Value>19831231</Value>
+                <Value>19821231</Value>
+                <Value>19811231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lubis-luftbilder_farbe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Images aériennes de cantons</ows:Title>
+            <ows:Abstract>Dans le cadre de différents projets des images aériennes de la Suisse sont saisies sur mandat de cantons. Toutes ces images aériennes sont représentées sous la forme des coordonnées du centre de l'image, de la zone couverte par l'image (footprint) ainsi que par des métadonnées. Les images aériennes peuvent être commandées auprès des cantons concernés.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lubis-luftbilder-dritte-kantone</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=5327cb7b-269b-4d02-b199-19418ee33d54"/>
+            <Style>
+                <ows:Title>Images aériennes de cantons</ows:Title>
+                <ows:Identifier>ch.swisstopo.lubis-luftbilder-dritte-kantone</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lubis-luftbilder-dritte-kantone_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>99991231</Default>
+                <Value>99991231</Value>
+                <Value>20161231</Value>
+                <Value>20141231</Value>
+                <Value>20131231</Value>
+                <Value>20121231</Value>
+                <Value>20111231</Value>
+                <Value>20091231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19891231</Value>
+                <Value>19881231</Value>
+                <Value>19871231</Value>
+                <Value>19861231</Value>
+                <Value>19851231</Value>
+                <Value>19841231</Value>
+                <Value>19811231</Value>
+                <Value>19671231</Value>
+                <Value>19661231</Value>
+                <Value>19651231</Value>
+                <Value>19641231</Value>
+                <Value>19631231</Value>
+                <Value>19621231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lubis-luftbilder-dritte-kantone/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Images aériennes swisstopo IR</ows:Title>
+            <ows:Abstract>La collection photographique de swisstopo comprend quelques 500'000 photos aériennes analogiques (en couleur, en infrarouge couleur ou en noir et blanc) et prises de vues terrestres. Environ 320’000 images aériennes sont représentées sous la forme des coordonnées du centre de l'image, de la zone couverte par l'image (footprint) ainsi que par des métadonnées. Environ 160‘000 images de ce fonds sont déjà numérisées et peuvent être visualisées en pleine [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lubis-luftbilder_infrarot</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=aee873f9-127a-4567-86a9-abb740bb9706"/>
+            <Style>
+                <ows:Title>Images aériennes swisstopo IR</ows:Title>
+                <ows:Identifier>ch.swisstopo.lubis-luftbilder_infrarot</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lubis-luftbilder_infrarot_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>99991231</Default>
+                <Value>99991231</Value>
+                <Value>20091231</Value>
+                <Value>20081231</Value>
+                <Value>20071231</Value>
+                <Value>20061231</Value>
+                <Value>20051231</Value>
+                <Value>20041231</Value>
+                <Value>20031231</Value>
+                <Value>20021231</Value>
+                <Value>20011231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19901231</Value>
+                <Value>19891231</Value>
+                <Value>19881231</Value>
+                <Value>19871231</Value>
+                <Value>19861231</Value>
+                <Value>19851231</Value>
+                <Value>19841231</Value>
+                <Value>19831231</Value>
+                <Value>19811231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lubis-luftbilder_infrarot/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Bas-marais régionaux</ows:Title>
+            <ows:Abstract>Les bas-marais, derniers témoins du paysage naturel et rural d’autrefois, sont en forte régression. Ils abritent des biocénoses très spécialisées, dont beaucoup de plantes et d’animaux menacés. L’inventaire scientifique des bas-marais a été dressé entre 1987 et 1990 par une communauté de travail, sur mandat du DFI. Les objets non retenus dans l’inventaire, sur la base des critères d’appréciation « superficie » et « végétation », ont été réunis dans une couche su [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.bafu.bundesinventare-flachmoore_regional</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=69077456-55ba-41f3-af49-debf4bb5324e"/>
+            <Style>
+                <ows:Title>Bas-marais régionaux</ows:Title>
+                <ows:Identifier>ch.bafu.bundesinventare-flachmoore_regional</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.bafu.bundesinventare-flachmoore_regional_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>20070731</Default>
+                <Value>20070731</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.bafu.bundesinventare-flachmoore_regional/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Images aér. swisstopo n/b</ows:Title>
+            <ows:Abstract>La collection photographique de swisstopo comprend quelques 500'000 photos aériennes analogiques (en couleur, en infrarouge couleur ou en noir et blanc) et prises de vues terrestres. Environ 320’000 images aériennes sont représentées sous la forme des coordonnées du centre de l'image, de la zone couverte par l'image (footprint) ainsi que par des métadonnées. Environ 160‘000 images de ce fonds sont déjà numérisées et peuvent être visualisées en pleine [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.lubis-luftbilder_schwarzweiss</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=12970991-2623-4e1e-a420-7435a6b5046c"/>
+            <Style>
+                <ows:Title>Images aér. swisstopo n/b</ows:Title>
+                <ows:Identifier>ch.swisstopo.lubis-luftbilder_schwarzweiss</ows:Identifier>
+                
+                 
+                
+                <LegendURL format="image/png" xlink:href="http://api3.geo.admin.ch/static/images/legends/ch.swisstopo.lubis-luftbilder_schwarzweiss_fr.png" />
+            </Style>
+            <Format>image/png</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>99991231</Default>
+                <Value>99991231</Value>
+                <Value>20101231</Value>
+                <Value>20091231</Value>
+                <Value>20081231</Value>
+                <Value>20071231</Value>
+                <Value>20061231</Value>
+                <Value>20051231</Value>
+                <Value>20041231</Value>
+                <Value>20031231</Value>
+                <Value>20021231</Value>
+                <Value>20011231</Value>
+                <Value>20001231</Value>
+                <Value>19991231</Value>
+                <Value>19981231</Value>
+                <Value>19971231</Value>
+                <Value>19961231</Value>
+                <Value>19951231</Value>
+                <Value>19941231</Value>
+                <Value>19931231</Value>
+                <Value>19921231</Value>
+                <Value>19911231</Value>
+                <Value>19901231</Value>
+                <Value>19891231</Value>
+                <Value>19881231</Value>
+                <Value>19871231</Value>
+                <Value>19861231</Value>
+                <Value>19851231</Value>
+                <Value>19841231</Value>
+                <Value>19831231</Value>
+                <Value>19821231</Value>
+                <Value>19811231</Value>
+                <Value>19801231</Value>
+                <Value>19791231</Value>
+                <Value>19781231</Value>
+                <Value>19771231</Value>
+                <Value>19761231</Value>
+                <Value>19751231</Value>
+                <Value>19741231</Value>
+                <Value>19731231</Value>
+                <Value>19721231</Value>
+                <Value>19711231</Value>
+                <Value>19701231</Value>
+                <Value>19691231</Value>
+                <Value>19681231</Value>
+                <Value>19671231</Value>
+                <Value>19661231</Value>
+                <Value>19651231</Value>
+                <Value>19641231</Value>
+                <Value>19631231</Value>
+                <Value>19621231</Value>
+                <Value>19611231</Value>
+                <Value>19601231</Value>
+                <Value>19591231</Value>
+                <Value>19581231</Value>
+                <Value>19571231</Value>
+                <Value>19561231</Value>
+                <Value>19551231</Value>
+                <Value>19541231</Value>
+                <Value>19531231</Value>
+                <Value>19521231</Value>
+                <Value>19511231</Value>
+                <Value>19501231</Value>
+                <Value>19491231</Value>
+                <Value>19481231</Value>
+                <Value>19471231</Value>
+                <Value>19461231</Value>
+                <Value>19451231</Value>
+                <Value>19441231</Value>
+                <Value>19431231</Value>
+                <Value>19421231</Value>
+                <Value>19411231</Value>
+                <Value>19401231</Value>
+                <Value>19391231</Value>
+                <Value>19381231</Value>
+                <Value>19371231</Value>
+                <Value>19361231</Value>
+                <Value>19351231</Value>
+                <Value>19341231</Value>
+                <Value>19331231</Value>
+                <Value>19321231</Value>
+                <Value>19311231</Value>
+                <Value>19301231</Value>
+                <Value>19291231</Value>
+                <Value>19281231</Value>
+                <Value>19271231</Value>
+                <Value>19261231</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_26</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/png" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.lubis-luftbilder_schwarzweiss/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Cartes nationales (grise)</ows:Title>
+            <ows:Abstract>swisstopo produit des cartes nationales à différentes échelles qui vont du 1:10'000 au 1:1 million. La couche cartes nationales (grise) combine les différentes échelles et affiche la carte la plus adaptée en fonction du niveau de zoom. La couche cartes nationales (grise) sert de fond de carte au géoportail fédéral. Elle est également disponible en géoservice WMS, WMTS.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-grau</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=74aef814-0c97-4261-a2c1-df4a948aca8e"/>
+            <Style>
+                <ows:Title>Cartes nationales (grise)</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-grau</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-grau/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>Cartes nationales (couleur)</ows:Title>
+            <ows:Abstract>swisstopo produit des cartes nationales à différentes échelles qui vont du 1:10'000 au 1:1 million. La couche cartes nationales (couleur) combine les différentes échelles et affiche la carte la plus adaptée en fonction du niveau de zoom. La couche cartes nationales (couleur) sert de fond de carte au géoportail fédéral. Elle est également disponible en géoservice WMS, WMTS.</ows:Abstract>
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.pixelkarte-farbe</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=f9c31be1-887c-4203-8b11-57b40ecc039b"/>
+            <Style>
+                <ows:Title>Cartes nationales (couleur)</ows:Title>
+                <ows:Identifier>ch.swisstopo.pixelkarte-farbe</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.pixelkarte-farbe/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+
+        <Layer>
+            <ows:Title>SWISSIMAGE</ows:Title>
+            <ows:Abstract>La mosaïque d'orthophotos SWISSIMAGE est un assemblage d'images aériennes analogiques scannées et numériques, en noir et blanc et en couleurs. Une orthophoto est une image aérienne dont les influences de l'inclinaison de la chambre de prise de vue et du relief du terrain sont neutralisées. Par défaut, l'état actuel du produit SWISSIMAGE est affiché. Avec l'outil de représentation historique des données – nommé « voyage dans le temps » - l&#39 [...]
+            <ows:WGS84BoundingBox>
+                <ows:LowerCorner>5.140242 45.398181</ows:LowerCorner>
+                <ows:UpperCorner>11.47757 48.230651</ows:UpperCorner>
+            </ows:WGS84BoundingBox>
+            <ows:Identifier>ch.swisstopo.swissimage</ows:Identifier>
+            <ows:Metadata xlink:href="http://www.geocat.ch/geonetwork/srv/deu/metadata.show?uuid=db5a52b4-0f5f-4998-a9a8-dd9539f93809"/>
+            <Style>
+                <ows:Title>SWISSIMAGE</ows:Title>
+                <ows:Identifier>ch.swisstopo.swissimage</ows:Identifier>
+                
+                 
+                
+            </Style>
+            <Format>image/jpeg</Format>
+            <Dimension>
+                <ows:Identifier>Time</ows:Identifier>
+                <Default>current</Default>
+                <Value>current</Value>
+            </Dimension>
+            <TileMatrixSetLink>
+                    <TileMatrixSet>21781_27</TileMatrixSet>
+            </TileMatrixSetLink>
+                <ResourceURL format="image/jpeg" resourceType="tile" template="http://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissimage/default/{Time}/21781/{TileMatrix}/{TileRow}/{TileCol}.jpeg"/>
+        </Layer>
+        
+
+<TileMatrixSet>
+<ows:Identifier>21781_17</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_18</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_19</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_20</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_21</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_22</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_23</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_24</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>24</ows:Identifier>
+
+<ScaleDenominator>5357.15646431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1250</MatrixWidth>
+
+<MatrixHeight>834</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_25</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>24</ows:Identifier>
+
+<ScaleDenominator>5357.15646431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1250</MatrixWidth>
+
+<MatrixHeight>834</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>25</ows:Identifier>
+
+<ScaleDenominator>3571.43764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1875</MatrixWidth>
+
+<MatrixHeight>1250</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_26</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>24</ows:Identifier>
+
+<ScaleDenominator>5357.15646431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1250</MatrixWidth>
+
+<MatrixHeight>834</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>25</ows:Identifier>
+
+<ScaleDenominator>3571.43764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1875</MatrixWidth>
+
+<MatrixHeight>1250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>26</ows:Identifier>
+
+<ScaleDenominator>1785.71882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3750</MatrixWidth>
+
+<MatrixHeight>2500</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_27</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>24</ows:Identifier>
+
+<ScaleDenominator>5357.15646431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1250</MatrixWidth>
+
+<MatrixHeight>834</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>25</ows:Identifier>
+
+<ScaleDenominator>3571.43764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1875</MatrixWidth>
+
+<MatrixHeight>1250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>26</ows:Identifier>
+
+<ScaleDenominator>1785.71882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3750</MatrixWidth>
+
+<MatrixHeight>2500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>27</ows:Identifier>
+
+<ScaleDenominator>892.859410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>7500</MatrixWidth>
+
+<MatrixHeight>5000</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Identifier>21781_28</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:21781</ows:SupportedCRS>
+<!-- This tileMatrixSet in **only** for tiles generated through TileGenerator ! -->
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+
+<ScaleDenominator>14285750.5715</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+
+<ScaleDenominator>13392891.1608</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+
+<ScaleDenominator>12500031.7501</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+
+<ScaleDenominator>11607172.3393</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+
+<ScaleDenominator>10714312.9286</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+
+<ScaleDenominator>9821453.51791</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+
+<ScaleDenominator>8928594.10719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+
+<ScaleDenominator>8035734.69647</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+
+<ScaleDenominator>7142875.28575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+
+<ScaleDenominator>6250015.87503</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+
+<ScaleDenominator>5357156.46431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+
+<ScaleDenominator>4464297.05359</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+
+<ScaleDenominator>3571437.64287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>2</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+
+<ScaleDenominator>2678578.23216</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+
+<ScaleDenominator>2321434.46787</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3</MatrixWidth>
+
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+
+<ScaleDenominator>1785718.82144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>4</MatrixWidth>
+
+<MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+
+<ScaleDenominator>892859.410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>8</MatrixWidth>
+
+<MatrixHeight>5</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+
+<ScaleDenominator>357143.764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>19</MatrixWidth>
+
+<MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+
+<ScaleDenominator>178571.882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>38</MatrixWidth>
+
+<MatrixHeight>25</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+
+<ScaleDenominator>71428.7528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>94</MatrixWidth>
+
+<MatrixHeight>63</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+
+<ScaleDenominator>35714.3764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>188</MatrixWidth>
+
+<MatrixHeight>125</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+
+<ScaleDenominator>17857.1882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>375</MatrixWidth>
+
+<MatrixHeight>250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>22</ows:Identifier>
+
+<ScaleDenominator>8928.59410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>750</MatrixWidth>
+
+<MatrixHeight>500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>23</ows:Identifier>
+
+<ScaleDenominator>7142.87528575</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>938</MatrixWidth>
+
+<MatrixHeight>625</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>24</ows:Identifier>
+
+<ScaleDenominator>5357.15646431</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1250</MatrixWidth>
+
+<MatrixHeight>834</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>25</ows:Identifier>
+
+<ScaleDenominator>3571.43764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>1875</MatrixWidth>
+
+<MatrixHeight>1250</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>26</ows:Identifier>
+
+<ScaleDenominator>1785.71882144</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>3750</MatrixWidth>
+
+<MatrixHeight>2500</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>27</ows:Identifier>
+
+<ScaleDenominator>892.859410719</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>7500</MatrixWidth>
+
+<MatrixHeight>5000</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>28</ows:Identifier>
+
+<ScaleDenominator>357.143764287</ScaleDenominator>
+<TopLeftCorner>420000.0 350000.0</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+
+<MatrixWidth>18750</MatrixWidth>
+
+<MatrixHeight>12500</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+
+    </Contents>
+    <Themes>
+   
+   
+           <Theme>
+               <ows:Title>Territoire et population</ows:Title>
+               <ows:Abstract>Territoire et population</ows:Abstract>
+               <ows:Identifier>166aac5999e07f47a0e5a74b417d3bbf</ows:Identifier>
+               <Theme>
+                   <ows:Title>Zones de réglementation et unités de déclaration</ows:Title>
+                   <ows:Abstract>Zones de réglementation et unités de déclaration</ows:Abstract>
+                   <ows:Identifier>95</ows:Identifier>
+                   
+                       <LayerRef>ch.babs.kulturgueter</LayerRef>
+                       <LayerRef>ch.bak.bundesinventar-schuetzenswerte-ortsbilder</LayerRef>
+                       <LayerRef>ch.bazl.projektierungszonen-flughafenanlagen</LayerRef>
+                       <LayerRef>ch.blw.alpprodukte</LayerRef>
+                       <LayerRef>ch.blw.bergprodukte</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-fleisch</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-kaese</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-konditoreiwaren</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-pflanzen</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-spirituosen</LayerRef>
+                       <LayerRef>ch.vbs.territorialregionen</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Santé et sécurité des personnes</ows:Title>
+                   <ows:Abstract>Santé et sécurité des personnes</ows:Abstract>
+                   <ows:Identifier>81</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.hydrologie-gewaesserzustandsmessstationen</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-wassertemperaturmessstationen</LayerRef>
+                       <LayerRef>ch.bafu.laerm-bahnlaerm_nacht</LayerRef>
+                       <LayerRef>ch.bafu.laerm-bahnlaerm_tag</LayerRef>
+                       <LayerRef>ch.bafu.laerm-strassenlaerm_nacht</LayerRef>
+                       <LayerRef>ch.bafu.laerm-strassenlaerm_tag</LayerRef>
+                       <LayerRef>ch.bafu.nabelstationen</LayerRef>
+                       <LayerRef>ch.bafu.swissprtr</LayerRef>
+                       <LayerRef>ch.bag.zecken-fsme-faelle</LayerRef>
+                       <LayerRef>ch.bag.zecken-fsme-impfung</LayerRef>
+                       <LayerRef>ch.bag.zecken-lyme</LayerRef>
+                       <LayerRef>ch.bav.laerm-emissionsplan_eisenbahn_nacht</LayerRef>
+                       <LayerRef>ch.bav.laerm-emissionsplan_eisenbahn_tag</LayerRef>
+                       <LayerRef>ch.ensi.zonenplan-notfallschutz-kernanlagen</LayerRef>
+               </Theme>
+           
+           </Theme>
+       
+           <Theme>
+               <ows:Title>Données de base</ows:Title>
+               <ows:Abstract>Données de base</ows:Abstract>
+               <ows:Identifier>3ca54fe99d7fa7b5bac71e1de6ed12cc</ows:Identifier>
+               <Theme>
+                   <ows:Title>Parcelles cadastrales</ows:Title>
+                   <ows:Abstract>Parcelles cadastrales</ows:Abstract>
+                   <ows:Identifier>47</ows:Identifier>
+                   
+                       <LayerRef>ch.are.bauzonen</LayerRef>
+                       <LayerRef>ch.bazl.projektierungszonen-flughafenanlagen</LayerRef>
+                       <LayerRef>ch.kantone.cadastralwebmap-farbe</LayerRef>
+                       <LayerRef>ch.swisstopo-vd.spannungsarme-gebiete</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Adresses</ows:Title>
+                   <ows:Abstract>Adresses</ows:Abstract>
+                   <ows:Identifier>44</ows:Identifier>
+                   
+                       <LayerRef>ch.bfs.gebaeude_wohnungs_register</LayerRef>
+                       <LayerRef>ch.swisstopo-vd.ortschaftenverzeichnis_plz</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Référentiels de coordonnées</ows:Title>
+                   <ows:Abstract>Référentiels de coordonnées</ows:Abstract>
+                   <ows:Identifier>2</ows:Identifier>
+                   
+                       <LayerRef>ch.swisstopo.dreiecksvermaschung</LayerRef>
+                       <LayerRef>ch.swisstopo.fixpunkte-agnes</LayerRef>
+                       <LayerRef>ch.swisstopo.fixpunkte-hfp1</LayerRef>
+                       <LayerRef>ch.swisstopo.fixpunkte-hfp2</LayerRef>
+                       <LayerRef>ch.swisstopo.fixpunkte-lfp1</LayerRef>
+                       <LayerRef>ch.swisstopo.fixpunkte-lfp2</LayerRef>
+                       <LayerRef>ch.swisstopo.geoidmodell-ch1903</LayerRef>
+                       <LayerRef>ch.swisstopo.geoidmodell-etrs89</LayerRef>
+                       <LayerRef>ch.swisstopo.koordinatenaenderung</LayerRef>
+                       <LayerRef>ch.swisstopo.transformationsgenauigkeit</LayerRef>
+                       <LayerRef>ch.swisstopo-vd.spannungsarme-gebiete</LayerRef>
+                       <LayerRef>ch.swisstopo.verschiebungsvektoren-tsp1</LayerRef>
+                       <LayerRef>ch.swisstopo.verschiebungsvektoren-tsp2</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Unités administratives</ows:Title>
+                   <ows:Abstract>Unités administratives</ows:Abstract>
+                   <ows:Identifier>34</ows:Identifier>
+                   
+                       <LayerRef>ch.are.agglomerationen_isolierte_staedte</LayerRef>
+                       <LayerRef>ch.are.alpenkonvention</LayerRef>
+                       <LayerRef>ch.are.gemeindetypen</LayerRef>
+                       <LayerRef>ch.are.wohnungsinventar-zweitwohnungsanteil</LayerRef>
+                       <LayerRef>ch.swisstopo.swissboundaries3d-bezirk-flaeche.fill</LayerRef>
+                       <LayerRef>ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill</LayerRef>
+                       <LayerRef>ch.swisstopo.swissboundaries3d-kanton-flaeche.fill</LayerRef>
+                       <LayerRef>ch.swisstopo.swissboundaries3d-land-flaeche.fill</LayerRef>
+                       <LayerRef>ch.swisstopo-vd.ortschaftenverzeichnis_plz</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-adminboundaries-protectedarea</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Dénominations géographiques</ows:Title>
+                   <ows:Abstract>Dénominations géographiques</ows:Abstract>
+                   <ows:Identifier>16</ows:Identifier>
+                   
+                       <LayerRef>ch.swisstopo.hiks-dufour</LayerRef>
+                       <LayerRef>ch.swisstopo.hiks-siegfried</LayerRef>
+                       <LayerRef>ch.swisstopo.landeskarte-farbe-10</LayerRef>
+                       <LayerRef>ch.swisstopo.landeskarte-grau-10</LayerRef>
+                       <LayerRef>ch.swisstopo.landesschwerenetz</LayerRef>
+                       <LayerRef>ch.swisstopo.lotabweichungen</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk1000.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk100.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk200.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk25.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk500.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.pixelkarte-farbe-pk50.noscale</LayerRef>
+                       <LayerRef>ch.swisstopo.swissnames3d</LayerRef>
+                       <LayerRef>ch.swisstopo.swisstlm3d-karte-farbe</LayerRef>
+                       <LayerRef>ch.swisstopo.swisstlm3d-karte-grau</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-miscellaneous</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-names-namedlocation</LayerRef>
+                       <LayerRef>ch.swisstopo.zeitreihen</LayerRef>
+               </Theme>
+           
+           </Theme>
+       
+           <Theme>
+               <ows:Title>Couverture du sol</ows:Title>
+               <ows:Abstract>Couverture du sol</ows:Abstract>
+               <ows:Identifier>65ae525db9108d44af83c0ee85dfd6b9</ows:Identifier>
+               <Theme>
+                   <ows:Title>Occupation des terres</ows:Title>
+                   <ows:Abstract>Occupation des terres</ows:Abstract>
+                   <ows:Identifier>69</ows:Identifier>
+                   
+                       <LayerRef>ch.bfs.arealstatistik</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-1985</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-1997</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodenbedeckung</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodenbedeckung-1985</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodenbedeckung-1997</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodennutzung</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodennutzung-1985</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-bodennutzung-1997</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-hintergrund</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-waldmischungsgrad</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-landcover</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-landcover-wald</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-heckenbaeume</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-primaerflaechen</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Ortho-imagerie</ows:Title>
+                   <ows:Abstract>Ortho-imagerie</ows:Abstract>
+                   <ows:Identifier>78</ows:Identifier>
+                   
+                       <LayerRef>ch.swisstopo.swissimage-product</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Hydrographie</ows:Title>
+                   <ows:Abstract>Hydrographie</ows:Abstract>
+                   <ows:Identifier>58</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.feststoffe-geschiebemessnetz</LayerRef>
+                       <LayerRef>ch.bafu.flussordnungszahlen-strahler</LayerRef>
+                       <LayerRef>ch.bafu.gewaesserschutz-badewasserqualitaet</LayerRef>
+                       <LayerRef>ch.bafu.gewaesserschutz-diffuse_eintraege_phosphor</LayerRef>
+                       <LayerRef>ch.bafu.gewaesserschutz-diffuse_eintraege_stickstoff</LayerRef>
+                       <LayerRef>ch.bafu.hydrogeologie-markierversuche</LayerRef>
+                       <LayerRef>ch.bafu.hydrogeologische-karte_100</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-daueruntersuchung_fliessgewaesser</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-hintergrundkarte</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-hochwassergrenzwertpegel</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-hochwasserstatistik</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-niedrigwasserstatistik</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-q347</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-untersuchungsgebiete</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-untersuchungsgebiete_stationen</LayerRef>
+                       <LayerRef>ch.bafu.hydrologischer-atlas_basisgebiete</LayerRef>
+                       <LayerRef>ch.bafu.hydrologischer-atlas_bilanzgebiete</LayerRef>
+                       <LayerRef>ch.bafu.hydrologischer-atlas_flussgebiete</LayerRef>
+                       <LayerRef>ch.bafu.hydrologischer-atlas_kantonale-messstationen</LayerRef>
+                       <LayerRef>ch.bafu.karst-ausdehnung_grundwasservorkommen</LayerRef>
+                       <LayerRef>ch.bafu.karst-einzugsgebiete</LayerRef>
+                       <LayerRef>ch.bafu.karst-einzugsgebietseinheiten</LayerRef>
+                       <LayerRef>ch.bafu.karst-quellen_schwinden</LayerRef>
+                       <LayerRef>ch.bafu.karst-unterirdische_fliesswege</LayerRef>
+                       <LayerRef>ch.bafu.mittlere-abfluesse</LayerRef>
+                       <LayerRef>ch.bafu.oekomorphologie-f_abschnitte</LayerRef>
+                       <LayerRef>ch.bafu.oekomorphologie-f_abstuerze</LayerRef>
+                       <LayerRef>ch.bafu.oekomorphologie-f_bauwerke</LayerRef>
+                       <LayerRef>ch.bafu.strukturguete-hochrhein_linkesufer</LayerRef>
+                       <LayerRef>ch.bafu.strukturguete-hochrhein_linkesumfeld</LayerRef>
+                       <LayerRef>ch.bafu.strukturguete-hochrhein_rechtesufer</LayerRef>
+                       <LayerRef>ch.bafu.strukturguete-hochrhein_rechtesumfeld</LayerRef>
+                       <LayerRef>ch.bafu.strukturguete-hochrhein_sohle</LayerRef>
+                       <LayerRef>ch.bafu.typisierung-fliessgewaesser</LayerRef>
+                       <LayerRef>ch.bafu.vec25-gewaessernetz_2000</LayerRef>
+                       <LayerRef>ch.bafu.vec25-seen</LayerRef>
+                       <LayerRef>ch.bafu.wasserbau-querprofilmarken</LayerRef>
+                       <LayerRef>ch.bafu.wasserbau-vermessungsstrecken</LayerRef>
+                       <LayerRef>ch.bfe.kleinwasserkraftpotentiale</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-hydrography</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-gewaessernetz</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Altitude</ows:Title>
+                   <ows:Abstract>Altitude</ows:Abstract>
+                   <ows:Identifier>62</ows:Identifier>
+                   
+                       <LayerRef>ch.bazl.luftfahrtkarten-icao</LayerRef>
+                       <LayerRef>ch.bazl.segelflugkarte</LayerRef>
+                       <LayerRef>ch.swisstopo.digitales-hoehenmodell_25_reliefschattierung</LayerRef>
+                       <LayerRef>ch.swisstopo.geoidmodell-ch1903</LayerRef>
+                       <LayerRef>ch.swisstopo.geoidmodell-etrs89</LayerRef>
+                       <LayerRef>ch.swisstopo.hangneigung-ueber_30</LayerRef>
+                       <LayerRef>ch.swisstopo-karto.hangneigung</LayerRef>
+                       <LayerRef>ch.swisstopo.swissalti3d-reliefschattierung</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-miscellaneous-geodpoint</LayerRef>
+               </Theme>
+           
+           </Theme>
+       
+           <Theme>
+               <ows:Title>Infrastructure et communication</ows:Title>
+               <ows:Abstract>Infrastructure et communication</ows:Abstract>
+               <ows:Identifier>7fb30ce0f2b5130ebcfd7b61127ba9ae</ows:Identifier>
+               <Theme>
+                   <ows:Title>Réseaux de transport</ows:Title>
+                   <ows:Abstract>Réseaux de transport</ows:Abstract>
+                   <ows:Identifier>109</ows:Identifier>
+                   
+                       <LayerRef>ch.astra.ivs-gelaendekarte</LayerRef>
+                       <LayerRef>ch.astra.ivs-nat</LayerRef>
+                       <LayerRef>ch.astra.ivs-nat_abgrenzungen</LayerRef>
+                       <LayerRef>ch.astra.ivs-nat-verlaeufe</LayerRef>
+                       <LayerRef>ch.astra.ivs-nat_wegbegleiter</LayerRef>
+                       <LayerRef>ch.astra.ivs-reg_loc</LayerRef>
+                       <LayerRef>ch.astra.mountainbikeland</LayerRef>
+                       <LayerRef>ch.astra.skatingland</LayerRef>
+                       <LayerRef>ch.astra.unfaelle-personenschaeden_alle</LayerRef>
+                       <LayerRef>ch.astra.unfaelle-personenschaeden_fahrraeder</LayerRef>
+                       <LayerRef>ch.astra.unfaelle-personenschaeden_fussgaenger</LayerRef>
+                       <LayerRef>ch.astra.unfaelle-personenschaeden_getoetete</LayerRef>
+                       <LayerRef>ch.astra.unfaelle-personenschaeden_motorraeder</LayerRef>
+                       <LayerRef>ch.astra.veloland</LayerRef>
+                       <LayerRef>ch.astra.wanderland</LayerRef>
+                       <LayerRef>ch.bav.haltestellen-oev</LayerRef>
+                       <LayerRef>ch.bav.schienennetz</LayerRef>
+                       <LayerRef>ch.bazl.einschraenkungen-drohnen</LayerRef>
+                       <LayerRef>ch.bazl.flugplaetze-heliports</LayerRef>
+                       <LayerRef>ch.bazl.gebirgslandeplaetze</LayerRef>
+                       <LayerRef>ch.bazl.luftfahrtkarten-icao</LayerRef>
+                       <LayerRef>ch.bazl.luftraeume-fluginformationsgebiet</LayerRef>
+                       <LayerRef>ch.bazl.luftraeume-fluginformationszonen</LayerRef>
+                       <LayerRef>ch.bazl.luftraeume-kontrollbezirke</LayerRef>
+                       <LayerRef>ch.bazl.luftraeume-kontrollzonen</LayerRef>
+                       <LayerRef>ch.bazl.luftraeume-nahkontrollbezirke</LayerRef>
+                       <LayerRef>ch.bazl.segelflugkarte</LayerRef>
+                       <LayerRef>ch.swisstopo-karto.schneeschuhrouten</LayerRef>
+                       <LayerRef>ch.swisstopo-karto.skitouren</LayerRef>
+                       <LayerRef>ch.swisstopo.swisstlm3d-wanderwege</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-transportation-oeffentliche-verkehr</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-transportation-strassennetz</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-anlagen</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-eisenbahnnetz</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-strassennetz</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-uebrigerverkehr</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Bâtiments</ows:Title>
+                   <ows:Abstract>Bâtiments</ows:Abstract>
+                   <ows:Identifier>128</ows:Identifier>
+                   
+                       <LayerRef>ch.bfs.gebaeude_wohnungs_register</LayerRef>
+                       <LayerRef>ch.swisstopo.swissbuildings3d</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-building</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-gebaeude</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Services d'utilité publique et services publics</ows:Title>
+                   <ows:Abstract>Services d'utilité publique et services publics</ows:Abstract>
+                   <ows:Identifier>133</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.gewaesserschutz-klaeranlagen_anteilq347</LayerRef>
+                       <LayerRef>ch.bafu.gewaesserschutz-klaeranlagen_ausbaugroesse</LayerRef>
+                       <LayerRef>ch.bafu.gewaesserschutz-klaeranlagen_reinigungstyp</LayerRef>
+                       <LayerRef>ch.bakom.anbieter-eigenes_festnetz</LayerRef>
+                       <LayerRef>ch.bakom.anschlussart-glasfaser</LayerRef>
+                       <LayerRef>ch.bakom.anschlussart-koaxialkabel</LayerRef>
+                       <LayerRef>ch.bakom.anschlussart-kupferdraht</LayerRef>
+                       <LayerRef>ch.bakom.downlink1</LayerRef>
+                       <LayerRef>ch.bakom.downlink10</LayerRef>
+                       <LayerRef>ch.bakom.downlink100</LayerRef>
+                       <LayerRef>ch.bakom.downlink2</LayerRef>
+                       <LayerRef>ch.bakom.downlink20</LayerRef>
+                       <LayerRef>ch.bakom.downlink50</LayerRef>
+                       <LayerRef>ch.bakom.uplink1</LayerRef>
+                       <LayerRef>ch.bakom.uplink10</LayerRef>
+                       <LayerRef>ch.bakom.uplink100</LayerRef>
+                       <LayerRef>ch.bakom.uplink2</LayerRef>
+                       <LayerRef>ch.bakom.uplink20</LayerRef>
+                       <LayerRef>ch.bakom.uplink50</LayerRef>
+                       <LayerRef>ch.bakom.verfuegbarkeit-hdtv</LayerRef>
+                       <LayerRef>ch.bakom.verfuegbarkeit-tv</LayerRef>
+                       <LayerRef>ch.bakom.versorgungsgebiet-tv</LayerRef>
+                       <LayerRef>ch.bakom.versorgungsgebiet-ukw</LayerRef>
+                       <LayerRef>ch.bfe.kernkraftwerke</LayerRef>
+                       <LayerRef>ch.bfe.solarenergie-eignung-daecher</LayerRef>
+                       <LayerRef>ch.bfe.solarenergie-eignung-fassaden</LayerRef>
+                       <LayerRef>ch.blw.alpprodukte</LayerRef>
+                       <LayerRef>ch.blw.bergprodukte</LayerRef>
+                       <LayerRef>ch.vbs.armeelogistikcenter</LayerRef>
+                       <LayerRef>ch.vbs.bundestankstellen-bebeco</LayerRef>
+                       <LayerRef>ch.vbs.grunddispositiv-zeus</LayerRef>
+                       <LayerRef>ch.vbs.logistikraeume-armeelogistikcenter</LayerRef>
+                       <LayerRef>ch.vbs.milairspacechart</LayerRef>
+                       <LayerRef>ch.vbs.patrouilledesglaciers-a_rennen</LayerRef>
+                       <LayerRef>ch.vbs.patrouilledesglaciers-z_rennen</LayerRef>
+                       <LayerRef>ch.vbs.retablierungsstellen</LayerRef>
+                       <LayerRef>ch.vbs.waldschadenkarte</LayerRef>
+               </Theme>
+           
+           </Theme>
+       
+           <Theme>
+               <ows:Title>Environnement, biologie et géologie</ows:Title>
+               <ows:Abstract>Environnement, biologie et géologie</ows:Abstract>
+               <ows:Identifier>a9e1354d90bc9d32387ca9eda47e50ad</ows:Identifier>
+               <Theme>
+                   <ows:Title>Répartition des espèces</ows:Title>
+                   <ows:Abstract>Répartition des espèces</ows:Abstract>
+                   <ows:Identifier>277</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.fauna-steinbockkolonien</LayerRef>
+                       <LayerRef>ch.bafu.moose</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-japanisches_geissblatt</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-riesenbaerenklau</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-sachalin_staudenknoeterich</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-schmetterlingsstrauch</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-seidiger_hornstrauch</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-spaetbluehende_goldrute</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-suedafrikanisches_greiskraut</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-syrische_seidenpflanze</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-topinambur</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-verlotscher_beifuss</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-vielaehriger_knoeterich</LayerRef>
+                       <LayerRef>ch.bafu.neophyten-vielblaettrige_lupine</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Sites protégés</ows:Title>
+                   <ows:Abstract>Sites protégés</ows:Abstract>
+                   <ows:Identifier>166</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.bundesinventare-amphibien</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-amphibien_wanderobjekte</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-auen</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-bln</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-flachmoore</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-hochmoore</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-jagdbanngebiete</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-moorlandschaften</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-trockenwiesen_trockenweiden</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-vogelreservate</LayerRef>
+                       <LayerRef>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung</LayerRef>
+                       <LayerRef>ch.bafu.schutzgebiete-paerke_nationaler_bedeutung_perimeter</LayerRef>
+                       <LayerRef>ch.bafu.schutzgebiete-ramsar</LayerRef>
+                       <LayerRef>ch.bafu.schutzgebiete-schweizerischer_nationalpark</LayerRef>
+                       <LayerRef>ch.bafu.unesco-weltnaturerbe</LayerRef>
+                       <LayerRef>ch.bafu.waldreservate</LayerRef>
+                       <LayerRef>ch.bafu.wrz-jagdbanngebiete_select</LayerRef>
+                       <LayerRef>ch.bafu.wrz-wildruhezonen_portal</LayerRef>
+                       <LayerRef>ch.bak.schutzgebiete-unesco_weltkulturerbe</LayerRef>
+                       <LayerRef>ch.pronatura.waldreservate</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotope</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Géologie</ows:Title>
+                   <ows:Abstract>Géologie</ows:Abstract>
+                   <ows:Identifier>183</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.hydrogeologie-uebersichtskarte</LayerRef>
+                       <LayerRef>ch.nagra.aeromagnetische-karte_1100</LayerRef>
+                       <LayerRef>ch.nagra.aeromagnetische-karte_1500</LayerRef>
+                       <LayerRef>ch.sgpk.maechtigkeit-lockergesteine</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-dosisleistung-terrestrisch</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-eiszeit-lgm</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-eiszeit-lgm-raster</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-generalkarte-ggk200</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geocover</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geodaesie-bouguer_anomalien</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geodaesie-isostatische_anomalien</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geologische_karte</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geologischer_atlas</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geomorphologie</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_jura</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-aeromagnetische_karte_schweiz</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-deklination</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-geothermie</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-inklination</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-totalintensitaet</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-gk200</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-gk500-genese</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-gk500-gesteinsklassierung</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-gk500-lithologie_hauptgruppen</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-steine_historische_bauwerke</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotope</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geowege</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-gravimetrischer_atlas</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-gravimetrischer_atlas.messpunkte</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservorkommen</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-hydrogeologische_karte-grundwasservulnerabilitaet</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-spezialkarten_schweiz.metadata</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-tektonische_karte</LayerRef>
+                       <LayerRef>ch.swisstopo.landesschwerenetz</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Sols</ows:Title>
+                   <ows:Abstract>Sols</ows:Abstract>
+                   <ows:Identifier>205</ows:Identifier>
+                   
+                       <LayerRef>ch.blw.bodeneignung-gruendigkeit</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-kulturland</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-kulturtyp</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-naehrstoffspeichervermoegen</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-skelettgehalt</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-vernaessung</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-wasserdurchlaessigkeit</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-wasserspeichervermoegen</LayerRef>
+                       <LayerRef>ch.blw.erosion</LayerRef>
+                       <LayerRef>ch.blw.erosion-mit_bergzonen</LayerRef>
+                       <LayerRef>ch.blw.erosion-quantitativ</LayerRef>
+                       <LayerRef>ch.blw.feldblockkarte</LayerRef>
+                       <LayerRef>ch.blw.gewaesseranschlusskarte</LayerRef>
+                       <LayerRef>ch.blw.gewaesseranschlusskarte-direkt</LayerRef>
+                       <LayerRef>ch.blw.hang_steillagen</LayerRef>
+                       <LayerRef>ch.blw.steil_terrassenlagen_rebbau</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Installations de suivi environnemental</ows:Title>
+                   <ows:Abstract>Installations de suivi environnemental</ows:Abstract>
+                   <ows:Identifier>223</ows:Identifier>
+                   
+                       <LayerRef>ch.are.alpenkonvention</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-gewaesserzustandsmessstationen</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-hydromessstationen</LayerRef>
+                       <LayerRef>ch.bafu.hydrologie-wassertemperaturmessstationen</LayerRef>
+                       <LayerRef>ch.bafu.wasser-entnahme</LayerRef>
+                       <LayerRef>ch.bafu.wasser-leitungen</LayerRef>
+                       <LayerRef>ch.bafu.wasser-rueckgabe</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Zones à risque naturel</ows:Title>
+                   <ows:Abstract>Zones à risque naturel</ows:Abstract>
+                   <ows:Identifier>232</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.permafrost</LayerRef>
+                       <LayerRef>ch.bafu.showme-gemeinden_hochwasser</LayerRef>
+                       <LayerRef>ch.bafu.showme-gemeinden_lawinen</LayerRef>
+                       <LayerRef>ch.bafu.showme-gemeinden_rutschungen</LayerRef>
+                       <LayerRef>ch.bafu.showme-gemeinden_sturzprozesse</LayerRef>
+                       <LayerRef>ch.bafu.showme-kantone_hochwasser</LayerRef>
+                       <LayerRef>ch.bafu.showme-kantone_lawinen</LayerRef>
+                       <LayerRef>ch.bafu.showme-kantone_rutschungen</LayerRef>
+                       <LayerRef>ch.bafu.showme-kantone_sturzprozesse</LayerRef>
+                       <LayerRef>ch.bafu.sturm-boeenspitzen_100</LayerRef>
+                       <LayerRef>ch.bafu.sturm-boeenspitzen_30</LayerRef>
+                       <LayerRef>ch.bafu.sturm-boeenspitzen_300</LayerRef>
+                       <LayerRef>ch.bafu.sturm-boeenspitzen_50</LayerRef>
+                       <LayerRef>ch.bafu.sturm-staudruck_100</LayerRef>
+                       <LayerRef>ch.bafu.sturm-staudruck_30</LayerRef>
+                       <LayerRef>ch.bafu.sturm-staudruck_300</LayerRef>
+                       <LayerRef>ch.bafu.sturm-staudruck_50</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Caractéristiques géographiques météorologiques</ows:Title>
+                   <ows:Abstract>Caractéristiques géographiques météorologiques</ows:Abstract>
+                   <ows:Identifier>242</ows:Identifier>
+                   
+                       <LayerRef>ch.blw.bewaesserungsbeduerftigkeit</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-gruendigkeit</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-kulturland</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-kulturtyp</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-naehrstoffspeichervermoegen</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-skelettgehalt</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-vernaessung</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-wasserdurchlaessigkeit</LayerRef>
+                       <LayerRef>ch.blw.bodeneignung-wasserspeichervermoegen</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-futterbau</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-getreidebau</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-kartoffeln</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-koernermais</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-kulturland</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-spezialkulturen</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-typ</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-zwischenfruchtbau</LayerRef>
+                       <LayerRef>ch.blw.niederschlagshaushalt</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Habitats et biotopes</ows:Title>
+                   <ows:Abstract>Habitats et biotopes</ows:Abstract>
+                   <ows:Identifier>261</ows:Identifier>
+                   
+                       <LayerRef>ch.bafu.auen-vegetationskarten</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-amphibien</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-amphibien_wanderobjekte</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-auen</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-flachmoore</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-hochmoore</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-jagdbanngebiete</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-moorlandschaften</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-trockenwiesen_trockenweiden</LayerRef>
+                       <LayerRef>ch.bafu.bundesinventare-vogelreservate</LayerRef>
+                       <LayerRef>ch.bafu.ren-extensive_landwirtschaftsgebiete</LayerRef>
+                       <LayerRef>ch.bafu.ren-feuchtgebiete</LayerRef>
+                       <LayerRef>ch.bafu.ren-fliessgewaesser_seen</LayerRef>
+                       <LayerRef>ch.bafu.ren-trockenstandorte</LayerRef>
+                       <LayerRef>ch.bafu.ren-wald</LayerRef>
+                       <LayerRef>ch.bafu.unesco-weltnaturerbe</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Ressources minérales</ows:Title>
+                   <ows:Abstract>Ressources minérales</ows:Abstract>
+                   <ows:Identifier>280</ows:Identifier>
+                   
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-gk200</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geotechnik-mineralische_rohstoffe200</LayerRef>
+               </Theme>
+           
+           </Theme>
+       
+           <Theme>
+               <ows:Title>Energie et économie</ows:Title>
+               <ows:Abstract>Energie et économie</ows:Abstract>
+               <ows:Identifier>fb3e2db0360b21a9acb953b54ef53b09</ows:Identifier>
+               <Theme>
+                   <ows:Title>Sources d'énergie</ows:Title>
+                   <ows:Abstract>Sources d'énergie</ows:Abstract>
+                   <ows:Identifier>308</ows:Identifier>
+                   
+                       <LayerRef>ch.bfe.kernkraftwerke</LayerRef>
+                       <LayerRef>ch.bfe.kleinwasserkraftpotentiale</LayerRef>
+                       <LayerRef>ch.bfe.meteorologische-vereisung</LayerRef>
+                       <LayerRef>ch.bfe.solarenergie-eignung-daecher</LayerRef>
+                       <LayerRef>ch.bfe.solarenergie-eignung-fassaden</LayerRef>
+                       <LayerRef>ch.bfe.windenergieanlagen</LayerRef>
+                       <LayerRef>ch.swisstopo.geologie-geophysik-geothermie</LayerRef>
+                       <LayerRef>ch.swisstopo.vec200-miscellaneous</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Installations agricoles et aquacoles</ows:Title>
+                   <ows:Abstract>Installations agricoles et aquacoles</ows:Abstract>
+                   <ows:Identifier>306</ows:Identifier>
+                   
+                       <LayerRef>ch.blw.bewaesserungsbeduerftigkeit</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Unités statistiques</ows:Title>
+                   <ows:Abstract>Unités statistiques</ows:Abstract>
+                   <ows:Identifier>284</ows:Identifier>
+                   
+                       <LayerRef>ch.are.agglomerationen_isolierte_staedte</LayerRef>
+                       <LayerRef>ch.are.gemeindetypen</LayerRef>
+                       <LayerRef>ch.are.wohnungsinventar-zweitwohnungsanteil</LayerRef>
+               </Theme>
+           
+       
+               <Theme>
+                   <ows:Title>Usage des sols</ows:Title>
+                   <ows:Abstract>Usage des sols</ows:Abstract>
+                   <ows:Identifier>287</ows:Identifier>
+                   
+                       <LayerRef>ch.are.bauzonen</LayerRef>
+                       <LayerRef>ch.bfs.arealstatistik-hintergrund</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-futterbau</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-getreidebau</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-kartoffeln</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-koernermais</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-kulturland</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-spezialkulturen</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-typ</LayerRef>
+                       <LayerRef>ch.blw.klimaeignung-zwischenfruchtbau</LayerRef>
+                       <LayerRef>ch.blw.niederschlagshaushalt</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-fleisch</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-kaese</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-konditoreiwaren</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-pflanzen</LayerRef>
+                       <LayerRef>ch.blw.ursprungsbezeichnungen-spirituosen</LayerRef>
+                       <LayerRef>ch.swisstopo.vec25-einzelobjekte</LayerRef>
+               </Theme>
+       
+    </Theme>
+  </Themes>
+    <ServiceMetadataURL xlink:href="http://www.opengis.uab.es/SITiled/world/1.0.0/WMTSCapabilities.xml"/>
+</Capabilities>
diff --git a/test/unit/org/openstreetmap/josm/JOSMFixture.java b/test/unit/org/openstreetmap/josm/JOSMFixture.java
index 7d33bd0..6ceaf5e 100644
--- a/test/unit/org/openstreetmap/josm/JOSMFixture.java
+++ b/test/unit/org/openstreetmap/josm/JOSMFixture.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.awt.BorderLayout;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -13,13 +14,17 @@ import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import javax.swing.JPanel;
+
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainPanel;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -139,20 +144,47 @@ public class JOSMFixture {
     }
 
     private void setupGUI() {
-        Main.getLayerManager().resetState();
+        JOSMTestRules.cleanLayerEnvironment();
         assertTrue(Main.getLayerManager().getLayers().isEmpty());
         assertNull(Main.getLayerManager().getEditLayer());
         assertNull(Main.getLayerManager().getActiveLayer());
 
-        if (Main.toolbar == null) {
-            Main.toolbar = new ToolbarPreferences();
-        }
+        initContentPane();
+        initMainPanel();
+        initToolbar();
         if (Main.main == null) {
             new MainApplication().initialize();
         } else {
-            Main.mainPanel.reAddListeners();
+            Main.main.panel.reAddListeners();
         }
         // Add a test layer to the layer manager to get the MapFrame
         Main.getLayerManager().addLayer(new TestLayer());
     }
+
+    /**
+     * Make sure {@code Main.contentPanePrivate} is initialized.
+     */
+    public static void initContentPane() {
+        if (Main.contentPanePrivate == null) {
+            Main.contentPanePrivate = new JPanel(new BorderLayout());
+        }
+    }
+
+    /**
+     * Make sure {@code Main.mainPanel} is initialized.
+     */
+    public static void initMainPanel() {
+        if (Main.mainPanel == null) {
+            Main.mainPanel = new MainPanel(Main.getLayerManager());
+        }
+    }
+
+    /**
+     * Make sure {@code Main.toolbar} is initialized.
+     */
+    public static void initToolbar() {
+        if (Main.toolbar == null) {
+            Main.toolbar = new ToolbarPreferences();
+        }
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/MainTest.java b/test/unit/org/openstreetmap/josm/MainTest.java
index 05bb0bd..1335560 100644
--- a/test/unit/org/openstreetmap/josm/MainTest.java
+++ b/test/unit/org/openstreetmap/josm/MainTest.java
@@ -45,7 +45,7 @@ public class MainTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().devAPI();
+    public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().commands();
 
     /**
      * Unit test of {@link DownloadParamType#paramType} method.
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index 45edb13..5c1543e 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Graphics2D;
 import java.io.File;
 import java.io.IOException;
@@ -16,6 +17,8 @@ import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -150,26 +153,6 @@ public final class TestUtils {
     }
 
     /**
-     * Returns the Java version as an int value.
-     * @return the Java version as an int value (8, 9, etc.)
-     */
-    public static int getJavaVersion() {
-        String version = System.getProperty("java.version");
-        if (version.startsWith("1.")) {
-            version = version.substring(2);
-        }
-        // Allow these formats:
-        // 1.8.0_72-ea
-        // 9-ea
-        // 9
-        // 9.0.1
-        int dotPos = version.indexOf('.');
-        int dashPos = version.indexOf('-');
-        return Integer.parseInt(version.substring(0,
-                dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
-    }
-
-    /**
      * Returns a private field value.
      * @param obj object
      * @param fieldName private field name
@@ -306,4 +289,25 @@ public final class TestUtils {
             throw new JosmRuntimeException(e);
         }
     }
+
+    /**
+     * Get a descendant component by name.
+     * @param root The root component to start searching from.
+     * @param name The component name
+     * @return The component with that name or null if it does not exist.
+     * @since 12045
+     */
+    public static Component getComponentByName(Component root, String name) {
+        if (name.equals(root.getName())) {
+            return root;
+        } else if (root instanceof Container) {
+            Container container = (Container) root;
+            return Stream.of(container.getComponents())
+                    .map(child -> getComponentByName(child, name))
+                    .filter(Objects::nonNull)
+                    .findFirst().orElse(null);
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java b/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
index ddb4faa..c907e05 100644
--- a/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
@@ -4,7 +4,7 @@ package org.openstreetmap.josm.actions;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
@@ -28,8 +28,8 @@ public final class AlignInLineActionTest {
     /**
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
+    @Before
+    public void setUp() {
         JOSMFixture.createUnitTestFixture().init(true);
 
         // Enable "Align in line" feature.
diff --git a/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java b/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
index be33b9c..2e82692 100644
--- a/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
@@ -5,10 +5,8 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -18,7 +16,6 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -43,24 +40,6 @@ public final class CreateCircleActionTest {
     public JOSMTestRules test = new JOSMTestRules().platform().projection().commands();
 
     /**
-     * FIXME: Conveniance method to prevent Selection Change events.
-     * A more proper way should be to define a TestingDataSet class with limited
-     * functionalities, but DataSet is declare as final (due to Cloneable interface).
-     *
-     * I don't know why, but in other tests there are no problem to add selected primitives
-     * but in this case there is a problem with an even listener of selection change.
-     * @param p primitive
-     * @param ds data set
-     * @throws ReflectiveOperationException if an error occurs
-     */
-    public void addSelected(OsmPrimitive p, DataSet ds) throws ReflectiveOperationException {
-        Method method = ds.getClass().getDeclaredMethod("addSelected",
-                                                        new Class<?>[] {Collection.class, boolean.class});
-        Utils.setObjectsAccessible(method);
-        method.invoke(ds, Collections.singleton(p), false);
-    }
-
-    /**
      * Test case: When Create Circle action is performed with a single way selected,
      * circle direction must equals way direction.
      * see #7421
@@ -82,7 +61,7 @@ public final class CreateCircleActionTest {
         w.setNodes(Arrays.asList(new Node[] {n1, n2, n3}));
         dataSet.addPrimitive(w);
 
-        addSelected(w, dataSet);
+        dataSet.addSelected(w);
 
         CreateCircleAction action = new CreateCircleAction();
         action.setEnabled(true);
@@ -144,9 +123,9 @@ public final class CreateCircleActionTest {
         dataSet.addPrimitive(n2);
         dataSet.addPrimitive(n3);
 
-        addSelected(n1, dataSet);
-        addSelected(n2, dataSet);
-        addSelected(n3, dataSet);
+        dataSet.addSelected(n1);
+        dataSet.addSelected(n2);
+        dataSet.addSelected(n3);
 
         // Mock left/right hand traffic database
         Field rlCache = RightAndLefthandTraffic.class.getDeclaredField("rlCache");
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
index 41dbd88..1de1584 100644
--- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
@@ -26,7 +26,7 @@ public class DownloadGpsTaskTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().https();
 
     /**
      * Unit test of {@code DownloadGpsTask#acceptsUrl} method.
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java
index bb19abd..ef6888c 100644
--- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java
@@ -26,7 +26,7 @@ public class DownloadNotesTaskTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules test = new JOSMTestRules().platform().https();
 
     /**
      * Unit test of {@code DownloadNotesTask#acceptsUrl} method.
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java
index fdbb235..9baa702 100644
--- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java
@@ -26,7 +26,7 @@ public class DownloadOsmTaskTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().https();
 
     /**
      * Unit test of {@code DownloadOsmTask#acceptsUrl} method.
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
index 98f9fac..7185fca 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.actions.mapmode;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.awt.event.InputEvent;
@@ -99,4 +100,14 @@ public class DrawActionTest {
             Main.getLayerManager().removeLayer(layer);
         }
     }
+
+    /**
+     * Non regression test case for bug #14762.
+     */
+    @Test
+    public void testTicket14762() {
+        DrawAction action = new DrawAction();
+        assertNull(action.getLayerManager().getEditDataSet());
+        assertEquals(0, action.getPreservedPrimitives().size());
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java b/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
index 8081b42..74017ca 100644
--- a/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
+++ b/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
@@ -1,10 +1,32 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 
+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.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent;
+import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.ListenerList;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -19,7 +41,403 @@ public class GpxDataTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().projection();
+
+    private GpxData data;
+
+    /**
+     * Set up empty test data
+     */
+    @Before
+    public void setUp() {
+        data = new GpxData();
+    }
+
+
+    /**
+     * Test method for {@link GpxData#mergeFrom(GpxData)}.
+     */
+    @Test
+    public void testMergeFrom() {
+        ImmutableGpxTrack track = singleWaypointGpxTrack();
+        GpxRoute route = singleWaypointRoute();
+        WayPoint newWP = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint existingWP = new WayPoint(LatLon.SOUTH_POLE);
+
+        GpxData dataToMerge = new GpxData();
+        dataToMerge.addTrack(track);
+        dataToMerge.addRoute(route);
+        dataToMerge.addWaypoint(newWP);
+
+        data.addWaypoint(existingWP);
+        data.mergeFrom(dataToMerge);
+
+        assertEquals(1, data.getTracks().size());
+        assertEquals(1, data.getRoutes().size());
+        assertEquals(2, data.getWaypoints().size());
+
+        assertTrue(data.getTracks().contains(track));
+        assertTrue(data.getRoutes().contains(route));
+        assertTrue(data.getWaypoints().contains(newWP));
+        assertTrue(data.getWaypoints().contains(existingWP));
+    }
+
+    /**
+     * Test method for {@link GpxData#getTracks()},  {@link GpxData#addTrack(GpxTrack)},  {@link GpxData#removeTrack(GpxTrack)}.
+     */
+    @Test
+    public void testTracks() {
+        assertEquals(0, data.getTracks().size());
+
+        ImmutableGpxTrack track1 = emptyGpxTrack();
+        ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+        data.addTrack(track1);
+        assertEquals(1, data.getTracks().size());
+        data.addTrack(track2);
+        assertEquals(2, data.getTracks().size());
+        assertTrue(data.getTracks().contains(track1));
+        assertTrue(data.getTracks().contains(track2));
+
+        data.removeTrack(track1);
+        assertEquals(1, data.getTracks().size());
+        assertFalse(data.getTracks().contains(track1));
+        assertTrue(data.getTracks().contains(track2));
+    }
+
+    /**
+     * Test method for {@link GpxData#addTrack(GpxTrack)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddTrackFails() {
+        ImmutableGpxTrack track1 = emptyGpxTrack();
+        data.addTrack(track1);
+        data.addTrack(track1);
+    }
+
+    /**
+     * Test method for {@link GpxData#removeTrack(GpxTrack)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveTrackFails() {
+        ImmutableGpxTrack track1 = emptyGpxTrack();
+        data.addTrack(track1);
+        data.removeTrack(track1);
+        data.removeTrack(track1);
+    }
+
+    /**
+     * Test method for {@link GpxData#getRoutes()}, {@link GpxData#addRoute(GpxRoute)}, {@link GpxData#removeRoute(GpxRoute)}.
+     */
+    @Test
+    public void testRoutes() {
+        assertEquals(0, data.getTracks().size());
+
+        GpxRoute route1 = new GpxRoute();
+        GpxRoute route2 = new GpxRoute();
+        route2.routePoints.add(new WayPoint(LatLon.NORTH_POLE));
+        data.addRoute(route1);
+        assertEquals(1, data.getRoutes().size());
+        data.addRoute(route2);
+        assertEquals(2, data.getRoutes().size());
+        assertTrue(data.getRoutes().contains(route1));
+        assertTrue(data.getRoutes().contains(route2));
+
+        data.removeRoute(route1);
+        assertEquals(1, data.getRoutes().size());
+        assertFalse(data.getRoutes().contains(route1));
+        assertTrue(data.getRoutes().contains(route2));
+    }
+
+    /**
+     * Test method for {@link GpxData#addRoute(GpxRoute)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddRouteFails() {
+        GpxRoute route1 = new GpxRoute();
+        data.addRoute(route1);
+        data.addRoute(route1);
+    }
+
+    /**
+     * Test method for {@link GpxData#removeRoute(GpxRoute)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveRouteFails() {
+        GpxRoute route1 = new GpxRoute();
+        data.addRoute(route1);
+        data.removeRoute(route1);
+        data.removeRoute(route1);
+    }
+
+    /**
+     * Test method for {@link GpxData#getWaypoints()}, {@link GpxData#addWaypoint(WayPoint)}, {@link GpxData#removeWaypoint(WayPoint)}.
+     */
+    @Test
+    public void testWaypoints() {
+        assertEquals(0, data.getTracks().size());
+
+        WayPoint waypoint1 = new WayPoint(LatLon.ZERO);
+        WayPoint waypoint2 = new WayPoint(LatLon.NORTH_POLE);
+        data.addWaypoint(waypoint1);
+        assertEquals(1, data.getWaypoints().size());
+        data.addWaypoint(waypoint2);
+        assertEquals(2, data.getWaypoints().size());
+        assertTrue(data.getWaypoints().contains(waypoint1));
+        assertTrue(data.getWaypoints().contains(waypoint2));
+
+        data.removeWaypoint(waypoint1);
+        assertEquals(1, data.getWaypoints().size());
+        assertFalse(data.getWaypoints().contains(waypoint1));
+        assertTrue(data.getWaypoints().contains(waypoint2));
+    }
+
+    /**
+     * Test method for {@link GpxData#addWaypoint(WayPoint)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddWaypointFails() {
+        WayPoint waypoint1 = new WayPoint(LatLon.ZERO);
+        data.addWaypoint(waypoint1);
+        data.addWaypoint(waypoint1);
+    }
+
+    /**
+     * Test method for {@link GpxData#removeWaypoint(WayPoint)}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveWaypointFails() {
+        WayPoint waypoint1 = new WayPoint(LatLon.ZERO);
+        data.addWaypoint(waypoint1);
+        data.removeWaypoint(waypoint1);
+        data.removeWaypoint(waypoint1);
+    }
+
+    /**
+     * Test method for {@link GpxData#hasTrackPoints()}.
+     */
+    @Test
+    public void testHasTrackPoints() {
+        assertFalse(data.hasTrackPoints());
+        ImmutableGpxTrack track1 = emptyGpxTrack();
+        data.addTrack(track1);
+        assertFalse(data.hasTrackPoints());
+        ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+        data.addTrack(track2);
+        assertTrue(data.hasTrackPoints());
+    }
+
+    /**
+     * Test method for {@link GpxData#getTrackPoints()}.
+     */
+    @Test
+    public void testGetTrackPoints() {
+        assertEquals(0, data.getTrackPoints().count());
+        ImmutableGpxTrack track1 = singleWaypointGpxTrack();
+        data.addTrack(track1);
+        assertEquals(1, data.getTrackPoints().count());
+        ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+        data.addTrack(track2);
+        assertEquals(2, data.getTrackPoints().count());
+    }
+
+    /**
+     * Test method for {@link GpxData#hasRoutePoints()}.
+     */
+    @Test
+    public void testHasRoutePoints() {
+
+    }
+
+    /**
+     * Test method for {@link GpxData#isEmpty()}.
+     */
+    @Test
+    public void testIsEmpty() {
+        ImmutableGpxTrack track1 = singleWaypointGpxTrack();
+        WayPoint waypoint = new WayPoint(LatLon.ZERO);
+        GpxRoute route = singleWaypointRoute();
+
+        assertTrue(data.isEmpty());
+
+        data.addTrack(track1);
+        assertFalse(data.isEmpty());
+        data.removeTrack(track1);
+        assertTrue(data.isEmpty());
+
+        data.addWaypoint(waypoint);
+        assertFalse(data.isEmpty());
+        data.removeWaypoint(waypoint);
+        assertTrue(data.isEmpty());
+
+        data.addRoute(route);
+        assertFalse(data.isEmpty());
+        data.removeRoute(route);
+        assertTrue(data.isEmpty());
+    }
+
+    /**
+     * Test method for {@link GpxData#length()}.
+     */
+    @Test
+    public void testLength() {
+        ImmutableGpxTrack track1 = waypointGpxTrack(
+                new WayPoint(new LatLon(0, 0)),
+                new WayPoint(new LatLon(1, 1)),
+                new WayPoint(new LatLon(0, 2)));
+        ImmutableGpxTrack track2 = waypointGpxTrack(
+                new WayPoint(new LatLon(0, 0)),
+                new WayPoint(new LatLon(-1, 1)));
+        data.addTrack(track1);
+        data.addTrack(track2);
+        assertEquals(3 * new LatLon(0, 0).greatCircleDistance(new LatLon(1, 1)), data.length(), 1);
+
+    }
+
+    /**
+     * Test method for {@link GpxData#getMinMaxTimeForAllTracks()}.
+     */
+    @Test
+    public void testGetMinMaxTimeForAllTracks() {
+        assertEquals(0, data.getMinMaxTimeForAllTracks().length);
+
+        WayPoint p1 = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint p2 = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint p3 = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint p4 = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint p5 = new WayPoint(LatLon.NORTH_POLE);
+        p1.setTime(new Date(200020));
+        p2.setTime(new Date(100020));
+        p4.setTime(new Date(500020));
+        data.addTrack(new ImmutableGpxTrack(Arrays.asList(Arrays.asList(p1, p2)), Collections.emptyMap()));
+        data.addTrack(new ImmutableGpxTrack(Arrays.asList(Arrays.asList(p3, p4, p5)), Collections.emptyMap()));
+
+        Date[] times = data.getMinMaxTimeForAllTracks();
+        assertEquals(times.length, 2);
+        assertEquals(new Date(100020), times[0]);
+        assertEquals(new Date(500020), times[1]);
+    }
+
+    /**
+     * Test method for {@link GpxData#nearestPointOnTrack(org.openstreetmap.josm.data.coor.EastNorth, double)}.
+     */
+    @Test
+    public void testNearestPointOnTrack() {
+        List<WayPoint> points = Stream
+                .of(new EastNorth(10, 10), new EastNorth(10, 0), new EastNorth(-1, 0))
+                .map(Main.getProjection()::eastNorth2latlon)
+                .map(WayPoint::new)
+                .collect(Collectors.toList());
+        data.addTrack(new ImmutableGpxTrack(Arrays.asList(points), Collections.emptyMap()));
+
+        WayPoint closeToMiddle = data.nearestPointOnTrack(new EastNorth(10, 0), 10);
+        assertEquals(points.get(1), closeToMiddle);
+
+        WayPoint close = data.nearestPointOnTrack(new EastNorth(5, 5), 10);
+        assertEquals(10, close.getEastNorth().east(), .01);
+        assertEquals(5, close.getEastNorth().north(), .01);
+
+        close = data.nearestPointOnTrack(new EastNorth(15, 5), 10);
+        assertEquals(10, close.getEastNorth().east(), .01);
+        assertEquals(5, close.getEastNorth().north(), .01);
+
+        assertNull(data.nearestPointOnTrack(new EastNorth(5, 5), 1));
+    }
+
+    /**
+     * Test method for {@link GpxData#getDataSources()}.
+     */
+    @Test
+    public void testGetDataSources() {
+        DataSource ds = new DataSource(new Bounds(0, 0, 1, 1), "test");
+        data.dataSources.add(ds);
+        assertEquals(new ArrayList<>(Arrays.asList(ds)), new ArrayList<>(data.getDataSources()));
+    }
+
+    /**
+     * Test method for {@link GpxData#getDataSourceArea()}.
+     */
+    @Test
+    public void testGetDataSourceArea() {
+        DataSource ds = new DataSource(new Bounds(0, 0, 1, 1), "test");
+        data.dataSources.add(ds);
+        assertNotNull(data.getDataSourceArea());
+        assertTrue(data.getDataSourceArea().contains(0.5, 0.5));
+        assertFalse(data.getDataSourceArea().contains(0.5, 1.5));
+    }
+
+    /**
+     * Test method for {@link GpxData#getDataSourceBounds()}.
+     */
+    @Test
+    public void testGetDataSourceBounds() {
+        Bounds bounds = new Bounds(0, 0, 1, 1);
+        DataSource ds = new DataSource(bounds, "test");
+        data.dataSources.add(ds);
+        assertEquals(Arrays.asList(bounds), data.getDataSourceBounds());
+    }
+
+    /**
+     * Test method for {@link GpxData#addChangeListener(GpxData.GpxDataChangeListener)},
+     * {@link GpxData#addWeakChangeListener(GpxData.GpxDataChangeListener)},
+     * {@link GpxData#removeChangeListener(GpxData.GpxDataChangeListener)}.
+     */
+    @Test
+    public void testChangeListener() {
+        TestChangeListener cl1 = new TestChangeListener();
+        TestChangeListener cl2 = new TestChangeListener();
+
+        data.addChangeListener(cl1);
+        data.addWeakChangeListener(cl2);
+        assertNull(cl1.lastEvent);
+        assertNull(cl2.lastEvent);
+
+        data.addTrack(singleWaypointGpxTrack());
+        assertEquals(data, cl1.lastEvent.getSource());
+        assertEquals(data, cl2.lastEvent.getSource());
+        cl1.lastEvent = null;
+        cl2.lastEvent = null;
+
+        data.addRoute(singleWaypointRoute());
+        assertEquals(data, cl1.lastEvent.getSource());
+        assertEquals(data, cl2.lastEvent.getSource());
+        cl1.lastEvent = null;
+        cl2.lastEvent = null;
+
+        data.removeChangeListener(cl1);
+        data.removeChangeListener(cl2);
+        data.addTrack(singleWaypointGpxTrack());
+        assertNull(cl1.lastEvent);
+        assertNull(cl2.lastEvent);
+    }
+
+    private static class TestChangeListener implements GpxDataChangeListener {
+
+        private GpxDataChangeEvent lastEvent;
+
+        @Override
+        public void gpxDataChanged(GpxDataChangeEvent e) {
+            lastEvent = e;
+        }
+
+    }
+
+    private static ImmutableGpxTrack emptyGpxTrack() {
+        return new ImmutableGpxTrack(Collections.emptyList(), Collections.emptyMap());
+    }
+
+    private static ImmutableGpxTrack singleWaypointGpxTrack() {
+        return new ImmutableGpxTrack(Collections.singleton(Collections.singleton(new WayPoint(LatLon.ZERO))), Collections.emptyMap());
+    }
+
+    private static ImmutableGpxTrack waypointGpxTrack(WayPoint... wps) {
+        return new ImmutableGpxTrack(Collections.singleton(Arrays.asList(wps)), Collections.emptyMap());
+    }
+
+    private static GpxRoute singleWaypointRoute() {
+        GpxRoute route = new GpxRoute();
+        route.routePoints.add(new WayPoint(LatLon.ZERO));
+        return route;
+    }
 
     /**
      * Unit test of methods {@link GpxData#equals} and {@link GpxData#hashCode}.
@@ -27,8 +445,9 @@ public class GpxDataTest {
     @Test
     public void testEqualsContract() {
         EqualsVerifier.forClass(GpxData.class).usingGetClass()
-            .withIgnoredFields("attr", "creator", "fromServer", "storageFile")
+            .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy")
             .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))
+            .withPrefabValues(ListenerList.class, ListenerList.create(), ListenerList.create())
             .verify();
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java b/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
index 4ff7bcd..01f3fef 100644
--- a/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
+++ b/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
@@ -30,7 +30,7 @@ public class WayPointTest {
     public void testEqualsContract() {
         EqualsVerifier.forClass(WayPoint.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
-            .withIgnoredFields("customColoring", "dir", "drawLine", "east", "north")
+            .withIgnoredFields("customColoring", "dir", "drawLine", "east", "north", "eastNorthCacheKey")
             .withPrefabValues(ColorSpace.class, ColorSpace.getInstance(ColorSpace.CS_sRGB), ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB))
             .verify();
     }
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java b/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java
index 07b47cf..f829e84 100644
--- a/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java
+++ b/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java
@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.imagery;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -28,4 +30,14 @@ public class GetCapabilitiesParseHelperTest {
     public void testUtilityClass() throws ReflectiveOperationException {
         UtilityClassTestUtil.assertUtilityClassWellDefined(GetCapabilitiesParseHelper.class);
     }
+
+    /**
+     * Unit test of {@code GetCapabilitiesParseHelper#crsToCode} method.
+     */
+    @Test
+    public void testCrsToCode() {
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg:3127"));
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg::3127"));
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg:6.6:3127"));
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java b/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
index 55b065d..2f79ae8 100644
--- a/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
+++ b/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
@@ -35,6 +35,7 @@ public class WMTSTileSourceTest {
     private ImageryInfo testImageryWIEN = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-wien.xml");
     private ImageryInfo testImageryWALLONIE = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Wallonie.xml");
     private ImageryInfo testImageryOntario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
+    private ImageryInfo testImageryGeoAdminCh = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-GeoAdminCh.xml");
     private ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
     private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
     private ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
@@ -244,7 +245,6 @@ public class WMTSTileSourceTest {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testLotsOfLayers);
         testSource.initProjection(Main.getProjection());
-
     }
 
     @Test
@@ -282,6 +282,25 @@ public class WMTSTileSourceTest {
                 );
     }
 
+    /**
+     * Test WMTS dimension.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testDimension() throws IOException {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:21781"));
+        ImageryInfo info = new ImageryInfo(testImageryGeoAdminCh);
+        Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
+        defaultLayers.add(new WMTSDefaultLayer("ch.are.agglomerationen_isolierte_staedte", "21781_26"));
+        info.setDefaultLayers(defaultLayers);
+        WMTSTileSource testSource = new WMTSTileSource(info);
+        testSource.initProjection(Main.getProjection());
+        assertEquals(
+                "http://wmts.geo.admin.ch/1.0.0/ch.are.agglomerationen_isolierte_staedte/default/20140101/21781/1/3/2.png",
+                testSource.getTileUrl(1, 2, 3)
+                );
+    }
+
     private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) {
         LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z));
         assertEquals("Latitude", expected.lat(), ll.lat(), 1e-05);
diff --git a/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java b/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
index 6d4ae10..153223f 100644
--- a/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
+++ b/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
@@ -30,7 +30,7 @@ public class SignpostAdaptersTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().https();
 
     private static HttpClient newClient() throws MalformedURLException {
         return HttpClient.create(new URL("https://www.openstreetmap.org"));
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
index aa28510..e28f59e 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.osm;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -123,4 +124,45 @@ public class DataSetTest {
         ds.addPrimitive(w2);
         ds.unlinkNodeFromWays(n2);
     }
+
+    /**
+     * Test the selection order.
+     * See <a href="https://josm.openstreetmap.de/ticket/14737">#14737</a>
+     * @since 12069
+     */
+    @Test
+    public void testSelectionOrderPreserved() {
+        final DataSet ds = new DataSet();
+        Node n1 = new Node(1);
+        Node n2 = new Node(2);
+        Node n3 = new Node(3);
+        ds.addPrimitive(n1);
+        ds.addPrimitive(n2);
+        ds.addPrimitive(n3);
+
+        assertEquals(Arrays.asList(), new ArrayList<>(ds.getSelected()));
+
+        ds.setSelected(n1.getPrimitiveId(), n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.clearSelection();
+        assertEquals(Arrays.asList(), new ArrayList<>(ds.getSelected()));
+
+        ds.addSelected(n3.getPrimitiveId());
+        ds.addSelected(n1.getPrimitiveId(), n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.addSelected(n3.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.clearSelection(n1.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.toggleSelected(n1.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n2, n1), new ArrayList<>(ds.getSelected()));
+
+        ds.toggleSelected(n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1), new ArrayList<>(ds.getSelected()));
+
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/SelectionEventManagerTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/SelectionEventManagerTest.java
new file mode 100644
index 0000000..82ffc08
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/SelectionEventManagerTest.java
@@ -0,0 +1,119 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests the {@link SelectionEventManager}
+ * @author Michael Zangl
+ * @since 12048
+ */
+public class SelectionEventManagerTest {
+    private final class SelectionListener implements SelectionChangedListener, DataSelectionListener {
+        private Collection<? extends OsmPrimitive> newSelection;
+        private final String name;
+
+        SelectionListener(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+            this.newSelection = newSelection;
+        }
+
+        @Override
+        public void selectionChanged(SelectionChangeEvent event) {
+            this.newSelection = event.getSelection();
+        }
+    }
+
+    /**
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Tests that events in the active layer are propagated.
+     */
+    @Test
+    public void testEventPropagation() {
+        // automatically adds the layers
+        CommandTestDataWithRelation testData1 = new CommandTestDataWithRelation();
+        CommandTestDataWithRelation testData2 = new CommandTestDataWithRelation();
+        Main.getLayerManager().setActiveLayer(testData1.layer);
+        assertEquals(testData1.layer, Main.getLayerManager().getEditLayer());
+
+        SelectionListener listener1 = new SelectionListener("IMMEDIATELY");
+        SelectionListener listener2 = new SelectionListener("IN_EDT_CONSOLIDATED");
+        SelectionListener listener3 = new SelectionListener("normal");
+        SelectionListener listener4 = new SelectionListener("edt");
+        SelectionEventManager instance = SelectionEventManager.getInstance();
+        instance.addSelectionListener(listener1, FireMode.IMMEDIATELY);
+        instance.addSelectionListener(listener2, FireMode.IN_EDT_CONSOLIDATED);
+        instance.addSelectionListener(listener3);
+        instance.addSelectionListenerForEdt(listener4);
+        List<SelectionListener> listeners = Arrays.asList(listener1, listener2, listener3, listener4);
+        assertSelectionEquals(listeners, null);
+
+        // active layer, should change
+        testData1.layer.data.setSelected(testData1.existingNode.getPrimitiveId());
+        assertSelectionEquals(listeners, new HashSet<OsmPrimitive>(Arrays.asList(testData1.existingNode)));
+
+        testData1.layer.data.clearSelection(testData1.existingNode.getPrimitiveId());
+        assertSelectionEquals(listeners, new HashSet<OsmPrimitive>(Arrays.asList()));
+
+        testData1.layer.data.addSelected(testData1.existingNode2.getPrimitiveId());
+        assertSelectionEquals(listeners, new HashSet<OsmPrimitive>(Arrays.asList(testData1.existingNode2)));
+
+        // changing to other dataset should trigger a empty selection
+        Main.getLayerManager().setActiveLayer(testData2.layer);
+        assertSelectionEquals(listeners, new HashSet<OsmPrimitive>(Arrays.asList()));
+
+        // This should not trigger anything, since the layer is not active any more.
+        testData1.layer.data.clearSelection(testData1.existingNode.getPrimitiveId());
+        assertSelectionEquals(listeners, null);
+
+        testData2.layer.data.setSelected(testData2.existingNode.getPrimitiveId());
+        assertSelectionEquals(listeners, new HashSet<OsmPrimitive>(Arrays.asList(testData2.existingNode)));
+
+        // removal
+        instance.removeSelectionListener((SelectionChangedListener) listener1);
+        instance.removeSelectionListener((SelectionChangedListener) listener2);
+        instance.removeSelectionListener((DataSelectionListener) listener3);
+        instance.removeSelectionListener((DataSelectionListener) listener4);
+
+        // no event triggered now
+        testData2.layer.data.setSelected(testData2.existingNode2.getPrimitiveId());
+        assertSelectionEquals(listeners, null);
+    }
+
+    private void assertSelectionEquals(List<SelectionListener> listeners, Object should) {
+        // sync
+        GuiHelper.runInEDTAndWait(() -> { });
+        for (SelectionListener listener : listeners) {
+            assertEquals(listener.name, should, listener.newSelection);
+            listener.newSelection = null;
+        }
+    }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java b/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java
new file mode 100644
index 0000000..708f375
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.visitor.paint;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
+
+/**
+ * Test the {@link StyledMapRenderer}
+ * @author Michael Zangl
+ * @since 12078
+ */
+public class StyledMapRendererTest {
+
+    /**
+     * Tests the floatToFixed function.
+     */
+    @Test
+    public void testFloatToFixed() {
+        long inf = floatToFixedCheckBits(Float.POSITIVE_INFINITY, 24);
+        long big = floatToFixedCheckBits(Float.MAX_VALUE, 24);
+        long two = floatToFixedCheckBits(2, 24);
+        // We use 15 bit for the significand. This should give us at least 3 decimal places
+        long x = floatToFixedCheckBits(1.001f, 24);
+        long one = floatToFixedCheckBits(1, 24);
+        long delta = floatToFixedCheckBits(Float.MIN_VALUE * 500, 24);
+        long epsilon = floatToFixedCheckBits(Float.MIN_VALUE, 24);
+        long zero = floatToFixedCheckBits(0, 24);
+        long negzero = floatToFixedCheckBits(-0, 24);
+        long negepsilon = floatToFixedCheckBits(-Float.MIN_VALUE, 24);
+        long negdelta = floatToFixedCheckBits(-Float.MIN_VALUE * 500, 24);
+        long negone = floatToFixedCheckBits(-1, 24);
+        long negx = floatToFixedCheckBits(-1.001f, 24);
+        long negtwo = floatToFixedCheckBits(-2, 24);
+        long negbig = floatToFixedCheckBits(-Float.MAX_VALUE, 24);
+        long neginf = floatToFixedCheckBits(Float.NEGATIVE_INFINITY, 24);
+
+        System.out.println(Integer.toHexString(Float.floatToIntBits(-Float.MAX_VALUE)));
+        // Positive
+        assertTrue(inf > big);
+        assertTrue(big > two);
+        assertTrue(two > x);
+        assertTrue(x > one);
+        assertTrue(one > delta);
+
+        // Close to zero - we don't care which way the epsilon round, but delta should not equal zero.
+        assertTrue(delta > zero);
+        assertTrue(negzero > negdelta);
+
+        assertTrue(delta >= epsilon);
+        assertTrue(epsilon >= zero);
+        assertTrue(zero >= negzero);
+        assertTrue(negzero >= negepsilon);
+        assertTrue(negepsilon >= negdelta);
+
+        // Negative
+        assertTrue(negdelta > negone);
+        assertTrue(negone > negx);
+        assertTrue(negx > negtwo);
+        assertTrue(negtwo > negbig);
+        assertTrue(negbig > neginf);
+
+        // Check the bit count
+        floatToFixedCheckBits((float) Math.PI, 32);
+        floatToFixedCheckBits((float) Math.PI, 20);
+        floatToFixedCheckBits((float) Math.PI, 25);
+        floatToFixedCheckBits(Float.NaN, 24);
+    }
+
+    private long floatToFixedCheckBits(float number, int totalBits) {
+        long result = StyleRecord.floatToFixed(number, totalBits);
+        long shouldBeZero = result >> totalBits;
+        assertEquals(0, shouldBeZero);
+        return result;
+    }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
index d031cb6..5229669 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
@@ -24,11 +24,11 @@ import java.util.TreeSet;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * This test is used to monitor changes in projection code.
@@ -179,7 +179,7 @@ public class ProjectionRegressionTest {
              }
         }
 
-        final boolean java9 = TestUtils.getJavaVersion() >= 9;
+        final boolean java9 = Utils.getJavaVersion() >= 9;
         for (TestData data : allData) {
             Projection proj = Projections.getProjectionByCode(data.code);
             if (proj == null) {
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ShiftedProjectionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ShiftedProjectionTest.java
index 8a2b625..7e5c2a1 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ShiftedProjectionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ShiftedProjectionTest.java
@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 import org.junit.Test;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -22,7 +23,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
 public class ShiftedProjectionTest {
     private static final class ProjectingBase implements Projecting {
         @Override
-        public EastNorth latlon2eastNorth(LatLon ll) {
+        public EastNorth latlon2eastNorth(ILatLon ll) {
             return new EastNorth(ll.lat() * 2, ll.lon() * 3);
         }
 
@@ -52,7 +53,7 @@ public class ShiftedProjectionTest {
     }
 
     /**
-     * Test {@link ShiftedProjecting#latlon2eastNorth(LatLon)}
+     * Test {@link ShiftedProjecting#latlon2eastNorth(ILatLon)}
      */
     @Test
     public void testLatlon2eastNorth() {
diff --git a/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java b/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java
index 165a384..d2036ef 100644
--- a/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java
@@ -67,14 +67,6 @@ public class MapViewStateTest {
         doTestGetCenter(s -> s.getCenter(), t -> t / 2d);
     }
 
-    /**
-     * Test {@link MapViewState#getCenterAtPixel()} returns map view center.
-     */
-    @Test
-    public void testGetCenterAtPixel() {
-        doTestGetCenter(s -> s.getCenterAtPixel(), t -> (double) (t / 2));
-    }
-
     private static void assertHasViewCoords(double x, double y, MapViewPoint center) {
         assertEquals("x", x, center.getInViewX(), 0.01);
         assertEquals("y", y, center.getInViewY(), 0.01);
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
index 1440d8b..3cb20ad 100644
--- a/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -26,6 +27,12 @@ public class PropertiesMergerTest {
      */
     @Test
     public void testPropertiesMerger() {
-        assertNotNull(new PropertiesMerger());
+        PropertiesMerger merger = new PropertiesMerger();
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmycoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheircoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidecoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmydeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheirdeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidedeletedstate"));
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java b/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
index fa741e8..a18d012 100644
--- a/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
@@ -25,7 +25,7 @@ public class HelpBrowserTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().https();
 
     static IHelpBrowser newHelpBrowser() {
         return new IHelpBrowser() {
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
index a08bb52..2a2f0b9 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
@@ -147,10 +147,10 @@ public class OsmDataLayerTest {
     @Test
     public void testGetToolTipText() {
         DataSet ds = new DataSet();
-        assertEquals("0 nodes, 0 ways, 0 relations", new OsmDataLayer(ds, "", null).getToolTipText());
+        assertEquals("<html>0 nodes<br>0 ways<br>0 relations</html>", new OsmDataLayer(ds, "", null).getToolTipText());
         fillDataSet(ds);
-        assertEquals("1 node, 1 way, 1 relation", new OsmDataLayer(ds, "", null).getToolTipText());
-        assertEquals("<html>1 node, 1 way, 1 relation<br>data.osm</html>", new OsmDataLayer(ds, "", new File("data.osm")).getToolTipText());
+        assertEquals("<html>1 node<br>1 way<br>1 relation</html>", new OsmDataLayer(ds, "", null).getToolTipText());
+        assertEquals("<html>1 node<br>1 way<br>1 relation<br>data.osm</html>", new OsmDataLayer(ds, "", new File("data.osm")).getToolTipText());
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java b/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
index ed17db6..d63dcbc 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
@@ -5,9 +5,8 @@ import static org.junit.Assert.assertEquals;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -15,7 +14,7 @@ import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.io.GpxReaderTest;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.xml.sax.SAXException;
@@ -124,14 +123,10 @@ public class GpxDrawHelperTest {
      */
     static List<String> calculateColors(String fileName, String layerName, int n) throws IOException, SAXException {
         final GpxData data = GpxReaderTest.parseGpxData(fileName);
-        final GpxDrawHelper gdh = new GpxDrawHelper(data);
+        final GpxLayer layer = new GpxLayer(data);
+        final GpxDrawHelper gdh = new GpxDrawHelper(layer);
         gdh.readPreferences(layerName);
         gdh.calculateColors();
-        final Iterator<WayPoint> wayPointIterator = data.tracks.iterator().next().getSegments().iterator().next().getWayPoints().iterator();
-        final List<String> colorCodes = new ArrayList<>(n);
-        while (colorCodes.size() < n) {
-            colorCodes.add(ColorHelper.color2html(wayPointIterator.next().customColoring));
-        }
-        return colorCodes;
+        return data.getTrackPoints().limit(n).map(p -> ColorHelper.color2html(p.customColoring)).collect(Collectors.toList());
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
index 9257d81..6109ca6 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java
@@ -5,9 +5,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.junit.BeforeClass;
@@ -57,7 +58,7 @@ public class TaggingPresetPreferenceTestIT {
         // Double traditional timeouts to avoid random problems
         Main.pref.putInteger("socket.timeout.connect", 30);
         Main.pref.putInteger("socket.timeout.read", 60);
-        Collection<Throwable> allErrors = new ArrayList<>();
+        Map<Object, Throwable> allErrors = new HashMap<>();
         Set<String> allMessages = new HashSet<>();
         for (ExtendedSourceEntry source : sources) {
             System.out.println(source.url);
@@ -72,7 +73,7 @@ public class TaggingPresetPreferenceTestIT {
                     e.printStackTrace();
                     // ignore frequent network errors with www.freietonne.de causing too much Jenkins failures
                     if (!source.url.contains("www.freietonne.de")) {
-                        allErrors.add(e1);
+                        allErrors.put(source.url, e1);
                     }
                     System.out.println(" => KO");
                 }
@@ -80,7 +81,7 @@ public class TaggingPresetPreferenceTestIT {
                 e.printStackTrace();
                 if (!source.url.contains("yopaseopor/")) {
                     // ignore https://raw.githubusercontent.com/yopaseopor/traffic_signs_preset_JOSM cause too much errors
-                    allErrors.add(e);
+                    allErrors.put(source.url, e);
                 }
                 System.out.println(" => KO");
             }
diff --git a/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java b/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
index 407f9d6..dac814f 100644
--- a/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
@@ -9,7 +9,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.ArrayList;
 
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -46,11 +46,11 @@ public class GpxReaderTest {
     @Test
     public void testMunich() throws Exception {
         final GpxData result = parseGpxData("data_nodist/munich.gpx");
-        assertEquals(2762, result.tracks.size());
-        assertEquals(0, result.routes.size());
-        assertEquals(903, result.waypoints.size());
+        assertEquals(2762, result.getTracks().size());
+        assertEquals(0, result.getRoutes().size());
+        assertEquals(903, result.getWaypoints().size());
 
-        final WayPoint tenthWayPoint = ((List<WayPoint>) result.waypoints).get(10);
+        final WayPoint tenthWayPoint = new ArrayList<>(result.getWaypoints()).get(10);
         assertEquals("128970", tenthWayPoint.get(GpxData.GPX_NAME));
         assertEquals(new LatLon(48.183956146240234, 11.43463134765625), tenthWayPoint.getCoor());
     }
diff --git a/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java b/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java
index 18c8e0a..e28ea03 100644
--- a/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java
@@ -2,21 +2,267 @@
 package org.openstreetmap.josm.io;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 /**
  * Unit tests of {@link OsmReader} class.
  */
 public class OsmReaderTest {
 
+    private static final class PostProcessorStub implements OsmServerReadPostprocessor {
+        boolean called;
+
+        @Override
+        public void postprocessDataSet(DataSet ds, ProgressMonitor progress) {
+            called = true;
+        }
+    }
+
+    /**
+     * Unit test of {@link OsmReader#registerPostprocessor} / {@link OsmReader#deregisterPostprocessor}.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testPostProcessors() throws Exception {
+        PostProcessorStub registered = new PostProcessorStub();
+        PostProcessorStub unregistered = new PostProcessorStub();
+
+        OsmReader.registerPostprocessor(registered);
+
+        OsmReader.registerPostprocessor(unregistered);
+        OsmReader.deregisterPostprocessor(unregistered);
+
+        try (InputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "empty.osm")) {
+            OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            assertTrue(registered.called);
+            assertFalse(unregistered.called);
+        } finally {
+            OsmReader.deregisterPostprocessor(registered);
+        }
+    }
+
+    private static void testUnknown(String osm) throws Exception {
+        try (InputStream in = new ByteArrayInputStream(
+                ("<?xml version='1.0' encoding='UTF-8'?>" + osm).getBytes(StandardCharsets.UTF_8))) {
+            assertTrue(OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE).allPrimitives().isEmpty());
+        }
+    }
+
+    /**
+     * Unit test of {@link OsmReader#parseUnknown} - root case.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testUnknownRoot() throws Exception {
+        testUnknown("<nonosm/>");
+    }
+
+    /**
+     * Unit test of {@link OsmReader#parseUnknown} - meta case from Overpass API.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testUnknownMeta() throws Exception {
+        testUnknown("<osm version='0.6'><meta osm_base='2017-03-29T19:04:03Z'/></osm>");
+    }
+
+    /**
+     * Unit test of {@link OsmReader#parseUnknown} - note case from Overpass API.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testUnknownNote() throws Exception {
+        testUnknown("<osm version='0.6'><note>The data included in this document is from www.openstreetmap.org.</note></osm>");
+    }
+
+    /**
+     * Unit test of {@link OsmReader#parseUnknown} - other cases.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testUnknownTag() throws Exception {
+        testUnknown("<osm version='0.6'><foo>bar</foo></osm>");
+        testUnknown("<osm version='0.6'><foo><bar/></foo></osm>");
+    }
+
+    /**
+     * Test invalid data.
+     * @param osm OSM data without XML prefix
+     * @param expectedError expected error message
+     * @throws Exception if any error occurs
+     */
+    private static void testInvalidData(String osm, String expectedError) throws Exception {
+        try (InputStream in = new ByteArrayInputStream(
+                ("<?xml version='1.0' encoding='UTF-8'?>" + osm).getBytes(StandardCharsets.UTF_8))) {
+            OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            fail("should throw exception");
+        } catch (IllegalDataException e) {
+            assertEquals(expectedError, e.getMessage());
+        }
+    }
+
+    /**
+     * Test invalid UID.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testInvalidUid() throws Exception {
+        testInvalidData("<osm version='0.6'><node id='1' uid='nan'/></osm>",
+                "Illegal value for attribute 'uid'. Got 'nan'. (at line 1, column 82). 82 bytes have been read");
+    }
+
+    /**
+     * Test missing ID.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testMissingId() throws Exception {
+        testInvalidData("<osm version='0.6'><node/></osm>",
+                "Missing required attribute 'id'. (at line 1, column 65). 64 bytes have been read");
+    }
+
+    /**
+     * Test missing ref.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testMissingRef() throws Exception {
+        testInvalidData("<osm version='0.6'><way id='1' version='1'><nd/></way></osm>",
+                "Missing mandatory attribute 'ref' on <nd> of way 1. (at line 1, column 87). 88 bytes have been read");
+        testInvalidData("<osm version='0.6'><relation id='1' version='1'><member/></relation></osm>",
+                "Missing attribute 'ref' on member in relation 1. (at line 1, column 96). 101 bytes have been read");
+    }
+
+    /**
+     * Test illegal ref.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testIllegalRef() throws Exception {
+        testInvalidData("<osm version='0.6'><way id='1' version='1'><nd ref='0'/></way></osm>",
+                "Illegal value of attribute 'ref' of element <nd>. Got 0. (at line 1, column 95). 96 bytes have been read");
+        testInvalidData("<osm version='0.6'><way id='1' version='1'><nd ref='nan'/></way></osm>",
+                "Illegal long value for attribute 'ref'. Got 'nan'. (at line 1, column 97). 98 bytes have been read");
+
+        testInvalidData("<osm version='0.6'><relation id='1' version='1'><member type='node' ref='0'/></relation></osm>",
+                "Incomplete <member> specification with ref=0 (at line 1, column 116). 121 bytes have been read");
+        testInvalidData("<osm version='0.6'><relation id='1' version='1'><member type='node' ref='nan'/></relation></osm>",
+                "Illegal value for attribute 'ref' on member in relation 1. Got nan (at line 1, column 118). 123 bytes have been read");
+    }
+
+    /**
+     * Test missing member type.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testMissingType() throws Exception {
+        testInvalidData("<osm version='0.6'><relation id='1' version='1'><member ref='1'/></relation></osm>",
+                "Missing attribute 'type' on member 1 in relation 1. (at line 1, column 104). 109 bytes have been read");
+    }
+
+    /**
+     * Test illegal member type.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testIllegalType() throws Exception {
+        testInvalidData("<osm version='0.6'><relation id='1' version='1'><member type='foo' ref='1'/></relation></osm>",
+                "Illegal value for attribute 'type' on member 1 in relation 1. Got foo. (at line 1, column 115). 120 bytes have been read");
+    }
+
+    /**
+     * Test missing key/value.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testMissingKeyValue() throws Exception {
+        testInvalidData("<osm version='0.6'><node id='1' version='1'><tag/></node></osm>",
+                "Missing key or value attribute in tag. (at line 1, column 89). 89 bytes have been read");
+        testInvalidData("<osm version='0.6'><node id='1' version='1'><tag k='foo'/></node></osm>",
+                "Missing key or value attribute in tag. (at line 1, column 97). 97 bytes have been read");
+        testInvalidData("<osm version='0.6'><node id='1' version='1'><tag v='bar'/></node></osm>",
+                "Missing key or value attribute in tag. (at line 1, column 97). 97 bytes have been read");
+    }
+
+    /**
+     * Test missing version.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testMissingVersion() throws Exception {
+        testInvalidData("<osm/>",
+                "Missing mandatory attribute 'version'. (at line 1, column 45). 44 bytes have been read");
+        testInvalidData("<osm version='0.6'><node id='1'/></osm>",
+                "Missing attribute 'version' on OSM primitive with ID 1. (at line 1, column 72). 72 bytes have been read");
+    }
+
+    /**
+     * Test unsupported version.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testUnsupportedVersion() throws Exception {
+        testInvalidData("<osm version='0.1'/>",
+                "Unsupported version: 0.1 (at line 1, column 59). 58 bytes have been read");
+    }
+
+    /**
+     * Test illegal version.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testIllegalVersion() throws Exception {
+        testInvalidData("<osm version='0.6'><node id='1' version='nan'/></osm>",
+                "Illegal value for attribute 'version' on OSM primitive with ID 1. Got nan. (at line 1, column 86). 86 bytes have been read");
+    }
+
+    /**
+     * Test illegal changeset.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testIllegalChangeset() throws Exception {
+        testInvalidData("<osm version='0.6'><node id='1' version='1' changeset='nan'/></osm>",
+                "Illegal value for attribute 'changeset'. Got nan. (at line 1, column 100). 100 bytes have been read");
+        testInvalidData("<osm version='0.6'><node id='1' version='1' changeset='0'/></osm>",
+                "Illegal value for attribute 'changeset'. Got 0. (at line 1, column 98). 98 bytes have been read");
+    }
+
+    /**
+     * Test invalid bounds.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testInvalidBounds() throws Exception {
+        testInvalidData("<osm version='0.6'><bounds/></osm>",
+                "Missing mandatory attributes on element 'bounds'. " +
+                "Got minlon='null',minlat='null',maxlon='null',maxlat='null', origin='null'. (at line 1, column 67). 72 bytes have been read");
+        testInvalidData("<osm version='0.6'><bounds minlon='0'/></osm>",
+                "Missing mandatory attributes on element 'bounds'. " +
+                "Got minlon='0',minlat='null',maxlon='null',maxlat='null', origin='null'. (at line 1, column 78). 83 bytes have been read");
+        testInvalidData("<osm version='0.6'><bounds minlon='0' minlat='0'/></osm>",
+                "Missing mandatory attributes on element 'bounds'. " +
+                "Got minlon='0',minlat='0',maxlon='null',maxlat='null', origin='null'. (at line 1, column 89). 94 bytes have been read");
+        testInvalidData("<osm version='0.6'><bounds minlon='0' minlat='0' maxlon='1'/></osm>",
+                "Missing mandatory attributes on element 'bounds'. " +
+                "Got minlon='0',minlat='0',maxlon='1',maxlat='null', origin='null'. (at line 1, column 100). 105 bytes have been read");
+    }
+
     /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14199">Bug #14199</a>.
      * @throws Exception if any error occurs
@@ -30,4 +276,36 @@ public class OsmReaderTest {
             assertTrue(w.isModified());
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14754">Bug #14754</a>.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testTicket14754() throws Exception {
+        try (InputStream in = TestUtils.getRegressionDataStream(14754, "malformed_for_14754.osm")) {
+            OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            fail("should throw exception");
+        } catch (IllegalDataException e) {
+            assertEquals("Illegal value for attributes 'lat', 'lon' on node with ID 1425146006." +
+                    " Got '550.3311950157', '10.49428298298'." +
+                    " (at line 5, column 179). 578 bytes have been read", e.getMessage());
+        }
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14788">Bug #14788</a>.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testTicket14788() throws Exception {
+        try (InputStream in = TestUtils.getRegressionDataStream(14788, "remove_sign_test_4.osm")) {
+            OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            fail("should throw exception");
+        } catch (IllegalDataException e) {
+            assertEquals("Illegal value for attributes 'lat', 'lon' on node with ID 978." +
+                    " Got 'nan', 'nan'." +
+                    " (at line 4, column 151). 336 bytes have been read", e.getMessage());
+        }
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java
new file mode 100644
index 0000000..4b7aaff
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link DNSNameFix} class.
+ */
+public class DNSNameFixTest {
+
+    /**
+     * Unit test of {@link DNSNameFix#DNSNameFix} - null check.
+     * @throws IOException always (expected with null name)
+     */
+    @Test(expected = IOException.class)
+    public void testDNSNameNull() throws IOException {
+        new DNSNameFix(null);
+    }
+
+    /**
+     * Unit test of {@link DNSNameFix#DNSNameFix} - nominal cases.
+     * @throws IOException never
+     */
+    @Test
+    public void testDNSNameNominal() throws IOException {
+        assertEquals("localhost", new DNSNameFix("localhost").getName());
+        assertEquals("127.0.0.1", new DNSNameFix("127.0.0.1").getName());
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java
deleted file mode 100644
index 6880c74..0000000
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-
-/**
- * Unit tests of {@link DNSName} class.
- */
-public class DNSNameTest {
-
-    /**
-     * Unit test of {@link DNSName#DNSName} - null check.
-     * @throws IOException always (expected with null name)
-     */
-    @Test(expected = IOException.class)
-    public void testDNSNameNull() throws IOException {
-        new DNSName(null);
-    }
-
-    /**
-     * Unit test of {@link DNSName#DNSName} - nominal cases.
-     * @throws IOException never
-     */
-    @Test
-    public void testDNSNameNominal() throws IOException {
-        assertEquals("localhost", new DNSName("localhost").getName());
-        assertEquals("127.0.0.1", new DNSName("127.0.0.1").getName());
-    }
-
-    /**
-     * Unit test of methods {@link DNSName#equals} and {@link DNSName#hashCode}.
-     */
-    @Test
-    public void testEqualsContract() {
-        EqualsVerifier.forClass(DNSName.class).suppress(Warning.NULL_FIELDS).verify();
-    }
-}
diff --git a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
index 8a1de4e..284fea6 100644
--- a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
@@ -127,8 +127,8 @@ public class SessionReaderTest {
         assertTrue(layers.get(0) instanceof ImageryLayer);
         final AbstractTileSourceLayer<?> image = (AbstractTileSourceLayer<?>) layers.get(0);
         assertEquals("Bing aerial imagery", image.getName());
-        assertEquals(image.getDisplaySettings().getDx(), 12.34, 1e-9);
-        assertEquals(image.getDisplaySettings().getDy(), -56.78, 1e-9);
+        assertEquals(-2.671667778864503, image.getDisplaySettings().getDx(), 1e-9);
+        assertEquals(13.89643478114158, image.getDisplaySettings().getDy(), 1e-9);
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java b/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java
index 95556c3..d52890e 100644
--- a/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java
+++ b/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java
@@ -12,11 +12,12 @@ import java.util.Map;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -132,7 +133,8 @@ public class SessionWriterTest {
 
     private ImageryLayer createImageryLayer() {
         TMSLayer layer = new TMSLayer(new ImageryInfo("the name", "http://www.url.com/"));
-        layer.getDisplaySettings().setDisplacement(new EastNorth(12, 34));
+        layer.getDisplaySettings().setOffsetBookmark(
+                new OffsetBookmark(Main.getProjection().toCode(), layer.getInfo().getName(), "", 12, 34));
         return layer;
     }
 
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index e227211..740370e 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -14,6 +14,7 @@ import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -149,6 +150,7 @@ public class JOSMTestRules implements TestRule {
      */
     public JOSMTestRules https() {
         useHttps = true;
+        platform = true;
         return this;
     }
 
@@ -285,13 +287,25 @@ public class JOSMTestRules implements TestRule {
     @SuppressFBWarnings("DM_GC")
     private void cleanUpFromJosmFixture() {
         MemoryManagerTest.resetState(true);
-        Main.getLayerManager().resetState();
+        cleanLayerEnvironment();
         Main.pref.resetToInitialState();
         Main.platform = null;
         System.gc();
     }
 
     /**
+     * Cleans the Layer manager and the SelectionEventManager.
+     * You don't need to call this during tests, the test environment will do it for you.
+     * @since 12070
+     */
+    public static void cleanLayerEnvironment() {
+        // Get the instance before cleaning - this ensures that it is initialized.
+        SelectionEventManager eventManager = SelectionEventManager.getInstance();
+        Main.getLayerManager().resetState();
+        eventManager.resetState();
+    }
+
+    /**
      * Clean up after running a test
      */
     @SuppressFBWarnings("DM_GC")
@@ -303,7 +317,7 @@ public class JOSMTestRules implements TestRule {
             }
         });
         // Remove all layers
-        Main.getLayerManager().resetState();
+        cleanLayerEnvironment();
         MemoryManagerTest.resetState(allowMemoryManagerLeaks);
 
         // TODO: Remove global listeners and other global state.
diff --git a/test/unit/org/openstreetmap/josm/tools/ListenableWeakReferenceTest.java b/test/unit/org/openstreetmap/josm/tools/ListenableWeakReferenceTest.java
new file mode 100644
index 0000000..bb4bead
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/ListenableWeakReferenceTest.java
@@ -0,0 +1,55 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests for {@link ListenableWeakReference}
+ * @author Michael Zangl
+ * @since 12181
+ */
+public class ListenableWeakReferenceTest {
+    /**
+     * Default test rules.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+    private Object object;
+    private boolean called;
+
+    /**
+     * Tests that {@link ListenableWeakReference#onDereference()} is called.
+     * @throws InterruptedException never
+     */
+    @Test
+    public void testOnDereference() throws InterruptedException {
+        object = new Object();
+        called = false;
+        ListenableWeakReference<Object> weak = new ListenableWeakReference<>(object, () -> called = true);
+        assertFalse(called);
+        assertSame(object, weak.get());
+
+        // now delete it
+        object = null;
+        System.gc();
+        System.runFinalization();
+        // now we wait for the listener thread
+        Thread.sleep(200);
+        assertTrue(called);
+
+        assertNotNull(weak);
+        assertNull(weak.get());
+    }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
index 91fca72..51d1cfa 100644
--- a/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
@@ -72,7 +72,9 @@ public class OsmUrlToBoundsTest {
                 OsmUrlToBounds.positionToBounds(51.4831, -0.3509, 10)),
         new ParseTestItem("https://www.openstreetmap.org/#map", null),
         new ParseTestItem("https://www.openstreetmap.org/#map=foo", null),
-        new ParseTestItem("https://www.openstreetmap.org/#map=fooz/foolat/foolon", null)
+        new ParseTestItem("https://www.openstreetmap.org/#map=fooz/foolat/foolon", null),
+        new ParseTestItem("http://tyrasd.github.io/latest-changes/#13/51.6891/10.2312",
+                OsmUrlToBounds.positionToBounds(51.6891, 10.2312, 13))
     };
 
     private static class ParseTestItem {
diff --git a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
index 723b360..4d09f52 100644
--- a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
@@ -195,6 +195,81 @@ public class UtilsTest {
     }
 
     /**
+     * Test {@link Utils#getJavaVersion}
+     */
+    @Test
+    public void testGetJavaVersion() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            System.setProperty("java.version", "1.8.0_72-ea");
+            assertEquals(8, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9-ea");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9.0.1");
+            assertEquals(9, Utils.getJavaVersion());
+        } finally {
+            System.setProperty("java.version", javaVersion);
+        }
+    }
+
+    /**
+     * Test {@link Utils#getJavaUpdate}
+     */
+    @Test
+    public void testGetJavaUpdate() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            System.setProperty("java.version", "1.8.0_131");
+            assertEquals(131, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "1.8.0_152-ea");
+            assertEquals(152, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9-ea");
+            assertEquals(0, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9");
+            assertEquals(0, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9.1.2");
+            assertEquals(1, Utils.getJavaUpdate());
+        } finally {
+            System.setProperty("java.version", javaVersion);
+        }
+    }
+
+    /**
+     * Test {@link Utils#getJavaBuild}
+     */
+    @Test
+    public void testGetJavaBuild() {
+        String javaVersion = System.getProperty("java.runtime.version");
+        try {
+            System.setProperty("java.runtime.version", "1.8.0_131-b11");
+            assertEquals(11, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "1.8.0_152-ea-b04");
+            assertEquals(4, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9-ea+170");
+            assertEquals(170, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9+200");
+            assertEquals(200, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9.1.2+62");
+            assertEquals(62, Utils.getJavaBuild());
+        } finally {
+            System.setProperty("java.runtime.version", javaVersion);
+        }
+    }
+
+    /**
      * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
      * @throws IOException in case of I/O error
      */
diff --git a/tools/checkstyle/josm_checks.xml b/tools/checkstyle/josm_checks.xml
index 9027596..93965a7 100644
--- a/tools/checkstyle/josm_checks.xml
+++ b/tools/checkstyle/josm_checks.xml
@@ -57,7 +57,6 @@ JOSM Checkstyle rules
       <property name="max" value="10"/>
     </module>
     <module name="OuterTypeNumber"/>
-    <module name="MethodCount"/>
     <module name="GenericWhitespace"/>
     <module name="EmptyForInitializerPad"/>
     <module name="EmptyForIteratorPad"/>
diff --git a/tools/checkstyle/josm_filters.xml b/tools/checkstyle/josm_filters.xml
index c2ccd43..e56ae8a 100644
--- a/tools/checkstyle/josm_filters.xml
+++ b/tools/checkstyle/josm_filters.xml
@@ -41,6 +41,6 @@
   <suppress checks="HeaderCheck" files="MenuScroller\.java" />
   <suppress checks="HeaderCheck" files="MultiSplitLayout\.java" />
   <suppress checks="HeaderCheck" files="MultiSplitPane\.java" />
-  <suppress checks="HeaderCheck" files="DNSName\.java" />
+  <suppress checks="HeaderCheck" files="DNSName(Fix)?\.java" />
   <suppress checks="FileLengthCheck" files="DomainValidator\.java" />
 </suppressions>
diff --git a/tools/pmd/josm-ruleset.xml b/tools/pmd/josm-ruleset.xml
index fe99608..26ab3cf 100644
--- a/tools/pmd/josm-ruleset.xml
+++ b/tools/pmd/josm-ruleset.xml
@@ -28,6 +28,7 @@
   </rule>
   <rule ref="rulesets/java/strictexception.xml">
   	<exclude name="ExceptionAsFlowControl"/>
+  	<exclude name="AvoidCatchingGenericException"/>
   	<exclude name="AvoidRethrowingException"/>
   </rule>
   <rule ref="rulesets/java/strings.xml">

-- 
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