[josm] 01/08: New upstream version 0.0.svn13367+dfsg

Bas Couwenberg sebastic at debian.org
Mon Jan 29 07:16:27 UTC 2018


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

sebastic pushed a commit to branch master
in repository josm.

commit a83d6d398e790cb600283328b024270106119d4e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 29 07:40:27 2018 +0100

    New upstream version 0.0.svn13367+dfsg
---
 .classpath                                         |    6 +-
 .settings/org.eclipse.core.resources.prefs         |    1 +
 CONTRIBUTION                                       |    4 +
 README                                             |   62 +-
 REVISION                                           |    6 +-
 appveyor.yml                                       |    2 -
 build.xml                                          |   22 +-
 data/defaultpresets.xml                            |   48 +-
 data/maps.xsd                                      |    4 +-
 data/validator/combinations.mapcss                 |    2 +-
 data/validator/deprecated.mapcss                   |   44 +
 data/validator/ignoretags.cfg                      |    5 +-
 data/validator/numeric.mapcss                      |  129 +-
 data/validator/unnecessary.mapcss                  |    2 +-
 data_nodist/csv.style                              |    8 -
 eclipse/JOSM (Java 8).launch                       |    2 +-
 i18n/build.xml                                     |   37 +-
 i18n/i18n.pl                                       |    1 +
 i18n/langinfo.pl                                   |    1 +
 i18n/po/af.po                                      | 1253 +++++-------
 i18n/po/am.po                                      | 1253 +++++-------
 i18n/po/ar.po                                      | 1255 +++++-------
 i18n/po/ast.po                                     | 1283 +++++-------
 i18n/po/az.po                                      | 1253 +++++-------
 i18n/po/be.po                                      | 1330 +++++--------
 i18n/po/bg.po                                      | 1297 +++++-------
 i18n/po/bn.po                                      | 1253 +++++-------
 i18n/po/br.po                                      | 1253 +++++-------
 i18n/po/bs.po                                      | 1253 +++++-------
 i18n/po/ca.po                                      | 1289 +++++-------
 i18n/po/ca at valencia.po                             | 1279 +++++-------
 i18n/po/cs.po                                      | 1549 ++++++--------
 i18n/po/cy.po                                      | 1253 +++++-------
 i18n/po/da.po                                      | 1529 ++++++--------
 i18n/po/de.po                                      | 1578 ++++++---------
 i18n/po/de_DE.po                                   | 1255 +++++-------
 i18n/po/el.po                                      | 1267 +++++-------
 i18n/po/en_AU.po                                   | 1257 +++++-------
 i18n/po/en_CA.po                                   | 1255 +++++-------
 i18n/po/en_GB.po                                   | 1683 +++++++---------
 i18n/po/eo.po                                      | 1255 +++++-------
 i18n/po/es.po                                      | 1980 +++++++++---------
 i18n/po/et.po                                      | 1257 +++++-------
 i18n/po/eu.po                                      | 1257 +++++-------
 i18n/po/fa.po                                      | 1255 +++++-------
 i18n/po/fi.po                                      | 1275 +++++-------
 i18n/po/fil.po                                     | 1253 +++++-------
 i18n/po/fo.po                                      | 1253 +++++-------
 i18n/po/fr.po                                      | 1538 ++++++--------
 i18n/po/ga.po                                      | 1253 +++++-------
 i18n/po/gl.po                                      | 1257 +++++-------
 i18n/po/he.po                                      | 1255 +++++-------
 i18n/po/hi.po                                      | 1253 +++++-------
 i18n/po/hr.po                                      | 1255 +++++-------
 i18n/po/ht.po                                      | 1253 +++++-------
 i18n/po/hu.po                                      | 1418 ++++++-------
 i18n/po/hy.po                                      | 1253 +++++-------
 i18n/po/ia.po                                      | 1253 +++++-------
 i18n/po/id.po                                      | 2105 +++++++++-----------
 i18n/po/is.po                                      | 1255 +++++-------
 i18n/po/it.po                                      | 1301 +++++-------
 i18n/po/ja.po                                      | 1502 ++++++--------
 i18n/po/ka.po                                      | 1255 +++++-------
 i18n/po/km.po                                      | 1259 +++++-------
 i18n/po/ko.po                                      | 1255 +++++-------
 i18n/po/ku.po                                      | 1253 +++++-------
 i18n/po/ky.po                                      | 1253 +++++-------
 i18n/po/lb.po                                      | 1253 +++++-------
 i18n/po/lo.po                                      | 1253 +++++-------
 i18n/po/lt.po                                      | 1293 +++++-------
 i18n/po/lv.po                                      | 1255 +++++-------
 i18n/po/mk.po                                      | 1253 +++++-------
 i18n/po/mr.po                                      | 1255 +++++-------
 i18n/po/ms.po                                      | 1253 +++++-------
 i18n/po/nb.po                                      | 1255 +++++-------
 i18n/po/nds.po                                     | 1253 +++++-------
 i18n/po/nl.po                                      | 1674 +++++++---------
 i18n/po/nn.po                                      | 1253 +++++-------
 i18n/po/oc.po                                      | 1255 +++++-------
 i18n/po/pa.po                                      | 1253 +++++-------
 i18n/po/pl.po                                      | 1431 ++++++-------
 i18n/po/pt.po                                      | 1346 +++++--------
 i18n/po/pt_BR.po                                   | 1602 +++++++--------
 i18n/po/rm.po                                      | 1253 +++++-------
 i18n/po/ro.po                                      | 1255 +++++-------
 i18n/po/ru.po                                      | 1534 ++++++--------
 i18n/po/sk.po                                      | 1472 ++++++--------
 i18n/po/sl.po                                      | 1255 +++++-------
 i18n/po/sq.po                                      | 1253 +++++-------
 i18n/po/sr.po                                      | 1255 +++++-------
 i18n/po/sv.po                                      | 1255 +++++-------
 i18n/po/ta.po                                      | 1255 +++++-------
 i18n/po/te.po                                      | 1253 +++++-------
 i18n/po/th.po                                      | 1253 +++++-------
 i18n/po/tr.po                                      | 1255 +++++-------
 i18n/po/ug.po                                      | 1253 +++++-------
 i18n/po/uk.po                                      | 1534 ++++++--------
 i18n/po/ur.po                                      | 1253 +++++-------
 i18n/po/vi.po                                      | 1284 +++++-------
 i18n/po/wae.po                                     | 1253 +++++-------
 i18n/po/zh_CN.po                                   | 1412 ++++++-------
 i18n/po/zh_TW.po                                   | 1267 +++++-------
 images/gps-lines.png                               |  Bin 564 -> 0 bytes
 images/layer-switcher-maximize.png                 |  Bin 287 -> 0 bytes
 images/layer-switcher-minimize.png                 |  Bin 203 -> 0 bytes
 images/presets/craft/beekeeper.svg                 |   98 +-
 images/presets/craft/painter.svg                   |  605 ++++--
 images/presets/education/library.svg               |  424 +---
 images/presets/education/school.svg                |  302 +--
 images/presets/misc/angles.svg                     |   34 +-
 images/statusline/angle.png                        |  Bin 191 -> 0 bytes
 images/statusline/angle.svg                        |    5 +
 images/statusline/dist.png                         |  Bin 102 -> 0 bytes
 images/statusline/dist.svg                         |    4 +
 images/statusline/heading.png                      |  Bin 410 -> 0 bytes
 images/statusline/heading.svg                      |    5 +
 images/statusline/lat.png                          |  Bin 365 -> 0 bytes
 images/statusline/lat.svg                          |    5 +
 images/statusline/lon.png                          |  Bin 370 -> 0 bytes
 images/statusline/lon.svg                          |    5 +
 netbeans/nbproject/project.properties              |    8 +-
 resources/org/glassfish/json/messages.properties   |   85 +-
 geticons.pl => scripts/geticons.pl                 |   50 +-
 optimize-images => scripts/optimize-images         |    0
 src/org/glassfish/json/messages.properties         |  112 --
 src/org/openstreetmap/josm/Main.java               |   44 +-
 .../josm/actions/CloseChangesetAction.java         |    8 +
 .../josm/actions/ExtensionFileFilter.java          |   15 +-
 .../josm/actions/ImageryAdjustAction.java          |   31 +-
 src/org/openstreetmap/josm/actions/MoveAction.java |    2 +-
 .../josm/actions/OpenLocationAction.java           |    2 +-
 src/org/openstreetmap/josm/actions/SaveAction.java |    4 +
 .../openstreetmap/josm/actions/SaveAsAction.java   |    4 +
 .../josm/actions/UnJoinNodeWayAction.java          |    2 +-
 .../actions/downloadtasks/DownloadNotesTask.java   |   16 +-
 .../DownloadOsmChangeCompressedTask.java           |   17 +-
 .../downloadtasks/DownloadOsmCompressedTask.java   |   18 +-
 .../josm/actions/mapmode/DrawAction.java           |  122 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |   14 +-
 .../josm/actions/mapmode/MapMode.java              |    2 +
 .../josm/actions/mapmode/SelectAction.java         |   32 +-
 .../relation/ExportRelationToGpxAction.java        |    4 +-
 .../actions/relation/RecentRelationsAction.java    |    8 +-
 .../josm/actions/search/SearchAction.java          |    4 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   41 -
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |   11 +-
 .../josm/data/imagery/ImageryInfo.java             |    1 +
 .../josm/data/osm/AbstractPrimitive.java           |    5 +
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   10 +
 .../openstreetmap/josm/data/osm/FilterMatcher.java |    6 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |   18 +
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |    3 +
 .../josm/data/osm/search/SearchCompiler.java       |    5 +-
 .../data/validation/routines/DomainValidator.java  |    4 +-
 .../josm/data/validation/tests/Highways.java       |    3 +-
 .../data/validation/tests/MapCSSTagChecker.java    |    5 +-
 .../data/validation/tests/OpeningHourTest.java     |   67 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   13 +-
 src/org/openstreetmap/josm/gui/ScrollViewport.java |    8 +-
 .../josm/gui/bugreport/BugReportDialog.java        |   14 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    8 +-
 .../josm/gui/dialogs/LayerListDialog.java          |    4 -
 .../ChangesetContentTableCellRenderer.java         |    8 +-
 .../josm/gui/download/DownloadObjectDialog.java    |    2 +-
 .../josm/gui/download/OverpassDownloadSource.java  |    2 +-
 .../gui/download/OverpassQueryWizardDialog.java    |    7 +-
 .../josm/gui/io/CustomConfigurator.java            |    6 +-
 .../josm/gui/io/importexport/NoteImporter.java     |    2 +-
 .../josm/gui/io/importexport/OsmExporter.java      |    2 +-
 .../josm/gui/io/importexport/OsmImporter.java      |    4 +-
 .../josm/gui/io/importexport/OsmXzExporter.java    |   24 +
 .../josm/gui/layer/AbstractTileSourceLayer.java    |    3 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |    6 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |    1 +
 .../josm/gui/layer/geoimage/ImageDisplay.java      |   20 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    8 +-
 .../josm/gui/layer/markerlayer/AudioMarker.java    |    2 +-
 .../josm/gui/layer/markerlayer/ImageMarker.java    |    2 +-
 .../josm/gui/layer/markerlayer/PlayHeadMarker.java |    2 +-
 .../josm/gui/layer/markerlayer/WebMarker.java      |    2 +-
 .../josm/gui/mappaint/StyleCache.java              |    5 +
 .../gui/mappaint/styleelement/AreaElement.java     |   11 +-
 .../remotecontrol/RemoteControlPreference.java     |    2 +-
 .../gui/tagging/presets/TaggingPresetReader.java   |   16 +
 .../josm/gui/tagging/presets/items/PresetLink.java |    5 +
 .../josm/gui/tagging/presets/items/Roles.java      |   16 +-
 .../josm/gui/util/AdvancedKeyPressDetector.java    |    1 +
 src/org/openstreetmap/josm/io/Compression.java     |   30 +-
 .../josm/io/OsmServerLocationReader.java           |   51 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |  101 +-
 .../josm/io/OverpassDownloadReader.java            |   12 +
 .../josm/io/imagery/ImageryReader.java             |    6 +-
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |   86 +-
 .../josm/plugins/PluginDownloadTask.java           |    2 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |   34 +-
 src/org/openstreetmap/josm/tools/HttpClient.java   |   19 +
 src/org/openstreetmap/josm/tools/I18n.java         |    4 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |   32 +-
 .../josm/tools/OverpassTurboQueryWizard.java       |   31 +-
 .../josm/tools/SAXReturnException.java             |   17 +
 src/org/openstreetmap/josm/tools/Utils.java        |   82 +-
 src/org/tukaani/xz/ArrayCache.java                 |  172 ++
 src/org/tukaani/xz/BCJCoder.java                   |   35 +
 src/org/tukaani/xz/BCJDecoder.java                 |   62 +
 src/org/tukaani/xz/BasicArrayCache.java            |  281 +++
 src/org/tukaani/xz/BlockInputStream.java           |  305 +++
 src/org/tukaani/xz/BlockOutputStream.java          |  135 ++
 src/org/tukaani/xz/CloseIgnoringInputStream.java   |   48 +
 src/org/tukaani/xz/CorruptedInputException.java    |   37 +
 src/org/tukaani/xz/CountingInputStream.java        |   47 +
 src/org/tukaani/xz/CountingOutputStream.java       |   54 +
 src/org/tukaani/xz/DeltaCoder.java                 |   26 +
 src/org/tukaani/xz/DeltaDecoder.java               |   32 +
 src/org/tukaani/xz/DeltaEncoder.java               |   37 +
 src/org/tukaani/xz/DeltaInputStream.java           |  146 ++
 src/org/tukaani/xz/DeltaOptions.java               |  103 +
 src/org/tukaani/xz/DeltaOutputStream.java          |  113 ++
 src/org/tukaani/xz/FilterCoder.java                |   16 +
 src/org/tukaani/xz/FilterDecoder.java              |   17 +
 src/org/tukaani/xz/FilterEncoder.java              |   18 +
 src/org/tukaani/xz/FilterOptions.java              |  104 +
 src/org/tukaani/xz/FinishableOutputStream.java     |   31 +
 src/org/tukaani/xz/IndexIndicatorException.java    |   14 +
 src/org/tukaani/xz/LZMA2Coder.java                 |   26 +
 src/org/tukaani/xz/LZMA2Decoder.java               |   35 +
 src/org/tukaani/xz/LZMA2Encoder.java               |   51 +
 src/org/tukaani/xz/LZMA2InputStream.java           |  400 ++++
 src/org/tukaani/xz/LZMA2Options.java               |  583 ++++++
 src/org/tukaani/xz/LZMA2OutputStream.java          |  270 +++
 src/org/tukaani/xz/MemoryLimitException.java       |   60 +
 src/org/tukaani/xz/RawCoder.java                   |   33 +
 src/org/tukaani/xz/SeekableInputStream.java        |   81 +
 src/org/tukaani/xz/SimpleInputStream.java          |  138 ++
 src/org/tukaani/xz/SingleXZInputStream.java        |  535 +++++
 .../tukaani/xz/UncompressedLZMA2OutputStream.java  |  164 ++
 .../tukaani/xz/UnsupportedOptionsException.java    |   34 +
 src/org/tukaani/xz/XZ.java                         |   53 +
 src/org/tukaani/xz/XZFormatException.java          |   24 +
 src/org/tukaani/xz/XZIOException.java              |   27 +
 src/org/tukaani/xz/XZInputStream.java              |  527 +++++
 src/org/tukaani/xz/XZOutputStream.java             |  606 ++++++
 src/org/tukaani/xz/check/CRC32.java                |   33 +
 src/org/tukaani/xz/check/CRC64.java                |   54 +
 src/org/tukaani/xz/check/Check.java                |   57 +
 src/org/tukaani/xz/check/None.java                 |   24 +
 src/org/tukaani/xz/check/SHA256.java               |   30 +
 src/org/tukaani/xz/common/DecoderUtil.java         |  121 ++
 src/org/tukaani/xz/common/EncoderUtil.java         |   36 +
 src/org/tukaani/xz/common/StreamFlags.java         |   15 +
 src/org/tukaani/xz/common/Util.java                |   28 +
 src/org/tukaani/xz/delta/DeltaCoder.java           |   27 +
 src/org/tukaani/xz/delta/DeltaDecoder.java         |   24 +
 src/org/tukaani/xz/delta/DeltaEncoder.java         |   24 +
 src/org/tukaani/xz/index/BlockInfo.java            |   38 +
 src/org/tukaani/xz/index/IndexBase.java            |   56 +
 src/org/tukaani/xz/index/IndexDecoder.java         |  223 +++
 src/org/tukaani/xz/index/IndexEncoder.java         |   59 +
 src/org/tukaani/xz/index/IndexHash.java            |   98 +
 src/org/tukaani/xz/index/IndexRecord.java          |   20 +
 src/org/tukaani/xz/lz/BT4.java                     |  265 +++
 src/org/tukaani/xz/lz/CRC32Hash.java               |   35 +
 src/org/tukaani/xz/lz/HC4.java                     |  210 ++
 src/org/tukaani/xz/lz/Hash234.java                 |  102 +
 src/org/tukaani/xz/lz/LZDecoder.java               |  133 ++
 src/org/tukaani/xz/lz/LZEncoder.java               |  428 ++++
 src/org/tukaani/xz/lz/Matches.java                 |   22 +
 src/org/tukaani/xz/lzma/LZMACoder.java             |  140 ++
 src/org/tukaani/xz/lzma/LZMADecoder.java           |  199 ++
 src/org/tukaani/xz/lzma/LZMAEncoder.java           |  750 +++++++
 src/org/tukaani/xz/lzma/LZMAEncoderFast.java       |  153 ++
 src/org/tukaani/xz/lzma/LZMAEncoderNormal.java     |  568 ++++++
 src/org/tukaani/xz/lzma/Optimum.java               |   73 +
 src/org/tukaani/xz/lzma/State.java                 |   75 +
 src/org/tukaani/xz/package-info.java               |   45 +
 src/org/tukaani/xz/rangecoder/RangeCoder.java      |   26 +
 src/org/tukaani/xz/rangecoder/RangeDecoder.java    |   83 +
 .../xz/rangecoder/RangeDecoderFromBuffer.java      |   71 +
 src/org/tukaani/xz/rangecoder/RangeEncoder.java    |  200 ++
 .../xz/rangecoder/RangeEncoderToBuffer.java        |   59 +
 src/org/tukaani/xz/simple/ARM.java                 |   50 +
 src/org/tukaani/xz/simple/ARMThumb.java            |   53 +
 src/org/tukaani/xz/simple/IA64.java                |   81 +
 src/org/tukaani/xz/simple/PowerPC.java             |   50 +
 src/org/tukaani/xz/simple/SPARC.java               |   56 +
 src/org/tukaani/xz/simple/SimpleFilter.java        |   14 +
 src/org/tukaani/xz/simple/X86.java                 |   98 +
 styles/standard/elemstyles.mapcss                  |   11 +
 test/data/plugin/corrupted_plugin.MANIFEST.MF      |   12 +
 test/data/regress/15730/capabilities.xml           |   86 +
 .../openstreetmap/josm/tools/HttpClientTest.java   |   26 +
 test/unit/org/openstreetmap/josm/TestUtils.java    |   16 +
 .../josm/actions/ExtensionFileFilterTest.java      |   14 +-
 .../AbstractDownloadTaskTestParent.java            |   11 +-
 .../downloadtasks/PluginDownloadTaskTest.java      |  163 ++
 .../josm/actions/mapmode/DrawActionTest.java       |    4 +-
 .../data/cache/JCSCachedTileLoaderJobTest.java     |   25 -
 .../openstreetmap/josm/data/gpx/WayPointTest.java  |    3 -
 .../josm/data/osm/search/SearchCompilerTest.java   |   20 +-
 .../layer/geoimage/CorrelateGpxWithImagesTest.java |   14 +-
 .../josm/io/OverpassDownloadReaderTest.java        |   42 +
 .../josm/io/imagery/WMSImageryTest.java            |   20 +
 .../josm/testutils/JOSMTestRules.java              |   43 +-
 tools/checkstyle/META-INF/MANIFEST.MF              |    2 +-
 303 files changed, 57997 insertions(+), 66399 deletions(-)

diff --git a/.classpath b/.classpath
index 05943dc..c69fd99 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/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzi [...]
+	<classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/ [...]
 	<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="src" path="test/functional"/>
@@ -14,14 +14,14 @@
 	<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.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.2.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"/>
 	<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
 	<classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.13.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.0.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 4824b80..4add34a 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//windows/locale=ISO-8859-1
 encoding/<project>=UTF-8
diff --git a/CONTRIBUTION b/CONTRIBUTION
index c000231..fe51f13 100644
--- a/CONTRIBUTION
+++ b/CONTRIBUTION
@@ -70,6 +70,10 @@ The opening hour validation uses code from opening_hour.js
 (https://github.com/ypid/opening_hours.js) which is licensed
 with the New (2-clause) BSD license.
 
+The XZ code (https://tukaani.org/xz/java.html)
+is from Lasse Collin and Igor Pavlov
+and license free Public Domain.
+
 ------------------------------- PROJECTION DATA -------------------------------
 
 French NTF_R93 NTV2 grid: Source: IGN - Institut national de l'information
diff --git a/README b/README
index 9b5dc5d..cb44cd5 100644
--- a/README
+++ b/README
@@ -59,15 +59,25 @@ This is an overview of the files and directories in the JOSM code repository:
 - CONTRIBUTION              list of major code contributors
 - data/                     data files that will be included in the JOSM jar file
     - fonts/                font files used for map rendering
+    - gpx/                  different color gradients for gpx drawing
     - projection/           projection files
-      - epsg                list of projection definitions
-    - *.lang                translation data
-    - *.xsd                 xml schema files for validation of configuration files
+      - custom-epsg         list of projection definitions, auto-generated file created by ant task 'epsg'
+    - security/*.pem        certificates that we like to accept for TLS connections, but are missing in the
+                            default Java certificate store
+    - validator/            data files used by the JOSM validator
+      - *.cfg               files designed for the old tagchecker, still in use
+      - *.mapcss            default validation rules for the MapCSS-based tagchecker
+      - opening_hours.js    Javascript code to validate opening hours tag
+                            (external library, see https://github.com/opening-hours/opening_hours.js)
+    - boundaries.osm        OSM file containing boundary data for the states of the earth, including
+                            data for right and left-hand traffic
+    - defaultpresets.xml    data file for the core tagging presets
     - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
                             on demand, but displayed inside the programm in a Java web browser component.)
-    - validator/            data files used by the JOSM validator feature
-      - *.cfg               files designed for the old tagchecker, still used
-      - *.mapcss            default validation rules for the new mapcss-based tagchecker
+    - overpass-wizard.js    Javascript code to provide a wizard-GUI for creating Overpass requests
+                            (external library, see https://github.com/tyrasd/overpass-wizard)
+    - *.lang                translation data
+    - *.xsd                 xml schema files for validation of configuration files
 - data_nodist/              data files that are useful for development, but not distributed
     - exif-direction-example.jpg
                             sample image, that contains direction information in the EXIF header
@@ -75,17 +85,27 @@ This is an overview of the files and directories in the JOSM code repository:
     - filterTests.osm       used for unit testing of the filter feature
                             (see test/unit/org/openstreetmap/josm/data/osm/FilterTest.java)
     - Join_Areas_Tests.osm  some examples to test the 'join areas' feature
-    - mapcss/               sample map styles and corresponding data files for regression testing
+    - *.*                   various other data files used for unit testing and as reference file
     - projection/           projection files
-      - *.gsb               NTv2 grid files for projection support (see CONTRIBUTION)
-    - projection-reference-data.csv
+      - *.gsb               NTv2 grid files for projection support, downloaded by the
+                            client on demand (see CONTRIBUTION)
+      - CHENyx06-Distribution.pdf
+                            archive of terms of use for the CHENyx06.gsb file
+      - epsg                EPSG data file, taken from the proj.4 project
+                            (see https://github.com/OSGeo/proj.4/blob/master/nad/epsg)
+      - josm-epsg           customizations to the epsg file, used together with the epsg file
+                            to generate data/projection/custom-epsg
+                            
+      - projection-reference-data.csv
                             reference data for projection tests
                             (see test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java)
-    - projection-regression-test-data.csv
+      - projection-regression-test-data.csv
                             regression data for projection tests
                             (see test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java)
-- geticons.pl               tool to find all used icons and allows deleting unused icons
-                            searches also for images with incompatible svg code
+    - trans/*.lang          translation data for files that are not distributed, but used
+                            by the server for localization of the services;
+                            currently contains plugin descriptions in order to include translations
+                            in the downloaded plugin list
 - gpl-2.0.txt, gpl-3.0.txt  full text of the GNU General Public License
 - images/                   images distributed with the JOSM binary
     - icons                 images for the Potlatch 2 style
@@ -99,12 +119,23 @@ This is an overview of the files and directories in the JOSM code repository:
                             files, Debian/Ubuntu scripts, man pages, icons, etc.
 - macosx/                   files needed to create the MacOS X package
 - netbeans/                 preconfigured Netbeans project
-- optimize-images           short script to decrease size of PNG images
 - patches/                  patches for external libraries used in JOSM (see below)
 - README                    this file
 - resources/                resource files that will be included in the JOSM jar file
 - scripts/                  various scripts used by JOSM developers
-- src/                      the source code of the program
+  - BuildProjectionDefinitions.java
+                            called from the ant build file to combine the files epsg and josm-epsg
+                            to create the custom-epsg file for distribution
+  - geticons.pl             tool to find all used icons and allows deleting unused icons
+                            searches also for images with incompatible svg code
+  - optimize-images         short script to decrease size of PNG images
+  - presets_lang.pl         helper script to update language links in presets file
+  - since_xxx.py            developer tool to replace "@since xxx" in Javadoc by the upcoming revision number
+  - SyncEditorLayerIndex.groovy
+                            script to compare and analyse the differences of the editor layer index and the
+                            JOSM imagery list (see https://josm.openstreetmap.de/wiki/ImageryCompare)
+  - TagInfoExtract.groovy   extracts tag information for the taginfo project
+- src/                      the source code of the application
 - start.html                HTML page to run the applet version of JOSM
 - styles/                   map styles included in JOSM
 - sytles_nodist/            files needed for map style maintenance
@@ -180,3 +211,6 @@ There are some third party libraries which are directly included in the source c
 * swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
     src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
     -> https://github.com/floscher/swinghelper
+* xz extractor
+    src/org/tukaani
+    -> https://tukaani.org/xz/java.html
diff --git a/REVISION b/REVISION
index 15598d7..f8920ec 100644
--- a/REVISION
+++ b/REVISION
@@ -2,7 +2,7 @@
 <info>
 <entry
    path="trunk"
-   revision="13265"
+   revision="13367"
    kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="13265">
+   revision="13367">
 <author>Don-vip</author>
-<date>2017-12-31T02:09:43.768156Z</date>
+<date>2018-01-28T22:08:56.144724Z</date>
 </commit>
 </entry>
 </info>
diff --git a/appveyor.yml b/appveyor.yml
index 132b277..e79fdcf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,8 +22,6 @@ artifacts:
   - path: checkstyle-josm.xml
   - path: pmd-josm.xml
   - path: spotbugs-josm.xml
-  - path: javadoc
-    type: zip
   - path: test\report
     type: zip
   - path: hs_err_pid*.log
diff --git a/build.xml b/build.xml
index 1d9034d..f322807 100644
--- a/build.xml
+++ b/build.xml
@@ -241,7 +241,7 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile-cots" depends="init">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
@@ -250,8 +250,6 @@ Build-Date: ${build.tstamp}
             <exclude name="org/apache/commons/compress/changes/**"/>
             <exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
             <exclude name="org/apache/commons/compress/compressors/brotli/**"/>
-            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
-            <exclude name="org/apache/commons/compress/compressors/xz/**"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
@@ -259,9 +257,11 @@ Build-Date: ${build.tstamp}
             <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
             <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
             <exclude name="org/apache/commons/compress/compressors/lz4/**"/>
+            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
             <exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
             <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
             <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
+            <exclude name="org/apache/commons/compress/compressors/xz/XZUtils.java"/>
             <exclude name="org/apache/commons/compress/compressors/z/**"/>
             <exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
             <exclude name="org/apache/commons/compress/parallel/**"/>
@@ -296,7 +296,7 @@ Build-Date: ${build.tstamp}
     <target name="compile-jmapviewer" depends="init">
         <!-- JMapViewer -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
+            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
@@ -315,13 +315,14 @@ Build-Date: ${build.tstamp}
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
     </target>
     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
         <!-- JOSM -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
@@ -344,6 +345,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:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
@@ -813,6 +815,16 @@ Build-Date: ${build.tstamp}
             encoding="UTF-8" classpath="${checkstyle.dir}/checkstyle-all.jar">
         </javac>
     </target>
+    <target name="checkstyle-changed" depends="checkstyle-compile">
+        <exec append="false" osfamily="unix" executable="bash" failifexecutionfails="true">
+            <arg value="-c"/>
+            <arg value="svn status -q --ignore-externals src test | grep -o '\(src\|test\)/.*' | xargs java -cp '${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}' com.puppycrawl.tools.checkstyle.Main -c ${checkstyle.dir}/josm_checks.xml | sed -e 's:\([^ ]*\) [^:]*/\([^:/]*.java\:[^:]*\):(\2)\1:'"/>
+        </exec>
+        <exec append="false" osfamily="windows" executable="powershell" failifexecutionfails="true">
+            <arg value="/c"/>
+            <arg value="svn status -q --ignore-externals src test | ForEach-Object {java -cp '${checkstyle.dir}/checkstyle-all.jar;${checkstyle-build.dir}' com.puppycrawl.tools.checkstyle.Main -c ${checkstyle.dir}/josm_checks.xml $_.split(' ')[7]}"/>
+        </exec>
+    </target>
     <target name="checkstyle" depends="checkstyle-compile">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
              classpath="${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 3942f8b..9320ece 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -299,7 +299,7 @@
         <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop,kiosk" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
     </chunk>
     <chunk id="power_extra">
         <reference ref="power_loc" />
@@ -1406,6 +1406,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:crossing"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:crossing"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:crossing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:crossing"
@@ -2340,6 +2341,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=basin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=basin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=basin"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=basin"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=basin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=basin"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:landuse=basin"
@@ -2504,6 +2506,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=ferry_terminal"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=ferry_terminal"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=ferry_terminal"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=ferry_terminal"
@@ -2561,6 +2564,7 @@
                     <check key="fuel:diesel" text="Diesel" />
                     <check key="fuel:biodiesel" text="Bio Diesel" />
                     <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_87" text="Octane 87" />
                     <check key="fuel:octane_91" text="Octane 91" />
                     <check key="fuel:octane_92" text="Octane 92" />
                     <check key="fuel:octane_95" text="Octane 95" />
@@ -2568,6 +2572,7 @@
                     <check key="fuel:octane_100" text="Octane 100" />
                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                    <check key="fuel:ethanol" text="Ethanol (alcohol)" />
                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
                 </checkgroup>
@@ -2725,6 +2730,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=subway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=subway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:railway=subway"
@@ -3130,6 +3136,7 @@
                     <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
                     <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
                     <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_87" text="Octane 87" />
                     <check key="fuel:octane_91" text="Octane 91" />
                     <check key="fuel:octane_92" text="Octane 92" />
                     <check key="fuel:octane_95" text="Octane 95" />
@@ -3137,6 +3144,7 @@
                     <check key="fuel:octane_100" text="Octane 100" />
                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                    <check key="fuel:ethanol" text="Ethanol (alcohol)" />
                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
                     <check key="fuel:1_25" text="1/25 mix (mofa/moped)" />
@@ -3269,6 +3277,7 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=car_parts"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=car_parts"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=car_parts"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=car_parts"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
             <space />
             <key key="shop" value="car_parts" />
@@ -3601,6 +3610,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=subway_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway_entrance"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:railway=subway_entrance"
@@ -6383,7 +6393,8 @@
         <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=9pin"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=9pin" />
             <space />
             <key key="sport" value="9pin" />
             <text key="name" text="Name" />
@@ -6393,7 +6404,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=10pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=10pin"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
@@ -6675,6 +6687,7 @@
         <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=boules"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:sport=boules"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=boules" />
             <space />
             <key key="sport" value="boules" />
@@ -6857,6 +6870,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building:part"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building:part"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building:part"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Key:building:part"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building:part"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:building:part" />
             <space />
@@ -6917,6 +6931,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=flagpole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=flagpole"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=flagpole"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=flagpole"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=flagpole"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=flagpole" />
@@ -7061,6 +7076,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=adit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=adit"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=adit"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=adit"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=adit"
@@ -7209,7 +7225,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
-            <text key="name" text="Name" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
+            </optional>
         </item> <!-- Water Well -->
         <separator/>
         <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
@@ -7292,6 +7311,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=survey_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=survey_point"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=survey_point"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=survey_point"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=survey_point"
@@ -8184,7 +8204,8 @@
                   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" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cheese"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=cheese" />
             <space />
             <key key="shop" value="cheese" />
             <reference ref="name_operator_oh_wheelchair" />
@@ -8242,7 +8263,8 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tea"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=tea"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tea"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=tea" />
             <space />
             <key key="shop" value="tea" />
             <reference ref="name_oh_wheelchair" />
@@ -8254,6 +8276,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=coffee"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=coffee"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=coffee"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=coffee"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=coffee" />
             <space />
             <key key="shop" value="coffee" />
@@ -8877,6 +8900,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=cosmetics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=cosmetics"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cosmetics"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=cosmetics"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=cosmetics" />
             <space />
             <key key="shop" value="cosmetics" />
@@ -9138,6 +9162,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=travel_agency"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=travel_agency"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=travel_agency"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=travel_agency"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=travel_agency" />
             <space />
             <key key="shop" value="travel_agency" />
@@ -9220,7 +9245,8 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=bookmaker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=bookmaker"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bookmaker" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bookmaker"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=bookmaker" />
             <space />
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh_wheelchair" />
@@ -9268,7 +9294,8 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=photo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=photo"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=photo"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=photo" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=photo"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=photo" />
             <space />
             <key key="shop" value="photo" />
             <reference ref="name_oh_wheelchair" />
@@ -10078,6 +10105,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=city"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=city"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=city"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:place=city"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=city"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=city"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=city"
@@ -10170,6 +10198,7 @@
         <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=quarter"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=quarter"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=quarter"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=quarter" />
             <space />
             <key key="place" value="quarter" />
@@ -10377,7 +10406,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=reef"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=reef"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=reef"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=reef" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=reef"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=reef" />
             <space />
             <key key="natural" value="reef" />
             <text key="name" text="Name" />
diff --git a/data/maps.xsd b/data/maps.xsd
index a414d4d..bde1f39 100644
--- a/data/maps.xsd
+++ b/data/maps.xsd
@@ -698,8 +698,10 @@
                             </xs:element>
                             <!--  is imagery properly georeferenced (i.e. no need to check offsets). Defaults to false. Affects showing warnings. -->
                             <xs:element name="valid-georeference" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-                            <!-- does imagery server supports JOSM 4326 to 3857 reprojection and non-square queries. Affects showing warnings. -->
+                            <!-- old unused feature, ignored -->
                             <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+                            <!-- does imagery server supports "/status" and tile re-rendering using "/dirty". Defaults to false. -->
+                            <xs:element name="mod-tile-features" minOccurs="0" maxOccurs="1" type="xs:boolean" />
                         </xs:choice>
                     </xs:sequence>
                     <xs:attribute name="last-check" type="xs:date" use="optional" />
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 8c8c8b4..e736ffa 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -348,7 +348,7 @@ way[highway][natural][natural!=ridge],
 }
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_centre|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
     throwWarning: tr("sport without physical feature");
     group: tr("missing tag");
     assertMatch: "node sport=tennis";
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index b43ae01..5002453 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -1170,4 +1170,48 @@ way[building=1] {
   suggestAlternative: "building=yes";
   group: tr("misspelled value");
   fixAdd: "building=yes";
+}
+
+/* #15675 */
+node[power=transformer][location=pole][transformer] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
+  fixChangeKey: "location => power";
+}
+node[power=transformer][location=pole][!transformer] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
+  fixChangeKey: "location => power";
+  fixAdd: "transformer=yes";
+}
+
+node[tourism=picnic_table],
+node[amenity=picnic_table],
+node[leisure=picnic],
+node[leisure=picnic_site] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tourism=picnic_site";
+  suggestAlternative: "leisure=picnic_table";
+  group: tr("deprecated tagging");
+}
+
+/* #15804 */
+relation[water=salt],
+way[water=salt],
+way[water=salt_pool],
+way[water=salt_panne],
+way[water=salt_pond] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "salt=yes";
+  suggestAlternative: "landuse=salt_pond";
+  group: tr("deprecated tagging");
+}
+
+/* #15805 */
+way[water=tidal] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tidal=yes";
+  fixAdd: "tidal=yes";
+  fixRemove: "water";
+  group: tr("deprecated tagging");
 }
\ No newline at end of file
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 7c2ba07..692bf58 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -174,6 +174,7 @@ K:glacier:type=mountain
 K:glacier:type=ice_tongue
 K:glacier:type=icecap
 K:waterway=drystream
+K:allotments=plot
 ;
 ; Highway Key/Value Pairs
 ;
@@ -319,8 +320,10 @@ K:type=tmc
 K:type=TMC
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see https://josm.openstreetmap.de/ticket/10759
+; see josm tickets 10759 and 15769
 ;
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
+K:power=catenary_mast
+K:man_made=kiln
\ No newline at end of file
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index 95eb3c0..27e197c 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -1,4 +1,4 @@
-/* measurement values and units warnings (ticket #8687) */
+/* measurement values and units warnings (tickets #8687, #15719) */
 
 *[/^[0-9]+$/] {
   throwWarning: tr("numerical key");
@@ -54,8 +54,20 @@
   assertNoMatch: "node building:levels=0"; /* valid because there can be building:levels:underground > 0 or roof:levels > 0 */
 }
 
-*[height][height !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "height");
+*[height][height =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("height=", replace(tag("height"), ",", "."));
+  set height_separator_autofix;
+  assertMatch: "node height=5,5";
+  assertMatch: "node height=12,00";
+  assertMatch: "node height=12,5 ft";
+  assertNoMatch: "node height=12,000";
+  assertNoMatch: "node height=3,50,5";
+  assertNoMatch: "node height=3.5";
+  assertNoMatch: "node height=4";
+}
+*[height][height !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/]!.height_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "node height=medium";
   assertMatch: "node height=-5";
   assertNoMatch: "node height=2 m";
@@ -65,8 +77,20 @@
   assertNoMatch: "node height=22'";
 }
 
-*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default)$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxheight");
+*[maxheight][maxheight =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxheight=", replace(tag("maxheight"), ",", "."));
+  set maxheight_separator_autofix;
+  assertMatch: "node maxheight=5,5";
+  assertMatch: "node maxheight=12,00";
+  assertMatch: "node maxheight=12,5 ft";
+  assertNoMatch: "node maxheight=12,000";
+  assertNoMatch: "node maxheight=3,50,5";
+  assertNoMatch: "node maxheight=3.5";
+  assertNoMatch: "node maxheight=4";
+}
+*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default)$/]!.maxheight_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "node maxheight=something";
   assertMatch: "node maxheight=-5";
   assertMatch: "node maxheight=0";
@@ -78,8 +102,19 @@
   assertNoMatch: "node maxheight=16'3\"";
 }
 
-way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "width");
+*[width][width =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("width=", replace(tag("width"), ",", "."));
+  set width_separator_autofix;
+  assertMatch: "node width=5,5";
+  assertMatch: "node width=12,00";
+  assertNoMatch: "node width=12,000";
+  assertNoMatch: "node width=3,50,5";
+  assertNoMatch: "node width=3.5";
+  assertNoMatch: "node width=4";
+}
+*[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?))$/]!.width_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way width=something";
   assertMatch: "way width=-5";
   assertNoMatch: "way width=3";
@@ -90,8 +125,19 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way width=10'5\"";
 }
 
-*[maxwidth][maxwidth !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxwidth");
+*[maxwidth][maxwidth =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxwidth=", replace(tag("maxwidth"), ",", "."));
+  set maxwidth_separator_autofix;
+  assertMatch: "node maxwidth=5,5";
+  assertMatch: "node maxwidth=12,00";
+  assertNoMatch: "node maxwidth=12,000";
+  assertNoMatch: "node maxwidth=3,50,5";
+  assertNoMatch: "node maxwidth=3.5";
+  assertNoMatch: "node maxwidth=4";
+}
+*[maxwidth][maxwidth !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxwidth_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way maxwidth=something";
   assertMatch: "way maxwidth=-5";
   assertNoMatch: "way maxwidth=2";
@@ -99,8 +145,20 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way maxwidth=2.5";
   assertNoMatch: "way maxwidth=7 ft";
 }
-*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: tonne is default; period is separator; if units, put space then unit", "maxweight");
+
+*[maxweight][maxweight =~ /^[0-9]+,[0-9][0-9]?( (t|kg|lbs))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxweight=", replace(tag("maxweight"), ",", "."));
+  set maxweight_separator_autofix;
+  assertMatch: "node maxweight=5,5";
+  assertMatch: "node maxweight=12,00";
+  assertNoMatch: "node maxweight=12,000";
+  assertNoMatch: "node maxweight=3,50,5";
+  assertNoMatch: "node maxweight=3.5";
+  assertNoMatch: "node maxweight=4";
+}
+*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxweight_separator_autofix {
+  throwWarning: tr("unusual value of {0}: tonne is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way maxweight=something";
   assertMatch: "way maxweight=-5";
   assertNoMatch: "way maxweight=2";
@@ -108,10 +166,11 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way maxweight=2.5";
   assertNoMatch: "way maxweight=7 kg";
 }
+
 way[maxspeed][maxspeed !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/],
 way[maxspeed:forward][maxspeed:forward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/],
 way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/] {
-  throwWarning: tr("unusual {0} format", "maxspeed");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way maxspeed=something";
   assertMatch: "way maxspeed=-50";
   assertMatch: "way maxspeed=0";
@@ -126,8 +185,19 @@ way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|wa
   assertNoMatch: "way maxspeed=variable";
 }
 
-*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: kilometers is default; period is separator; if units, put space then unit", "distance");
+*[distance][distance =~ /^[0-9]+,[0-9][0-9]?( (m|km|mi|nmi))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("distance=", replace(tag("distance"), ",", "."));
+  set distance_separator_autofix;
+  assertMatch: "node distance=5,5";
+  assertMatch: "node distance=12,00";
+  assertNoMatch: "node distance=12,000";
+  assertNoMatch: "node distance=3,50,5";
+  assertNoMatch: "node distance=3.5";
+  assertNoMatch: "node distance=4";
+}
+*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.distance_separator_autofix {
+  throwWarning: tr("unusual value of {0}: kilometers is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way distance=something";
   assertMatch: "way distance=-5";
   assertNoMatch: "way distance=2";
@@ -144,7 +214,7 @@ way[voltage][voltage =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/] {
 /* some users are using frequency for other purposes (not electromagnetic) 
    with the values 'perennial' and 'intermittent'; the vast majority are 0, 16.7, 50 and 60 */
 way[frequency][frequency !~ /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/] {
-  throwWarning: tr("unusual {0} specification", "frequency");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way frequency=something";
   assertNoMatch: "way frequency=0"; /* DC */
   assertNoMatch: "way frequency=16.7";
@@ -154,7 +224,7 @@ way[frequency][frequency !~ /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/]
 }
 
 way[gauge][gauge !~ /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)$/] {
-  throwWarning: tr("unusual train track gauge; use mm with no separator");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way gauge=something";
   assertNoMatch: "way gauge=1435";
   assertNoMatch: "way gauge=1000;1435";
@@ -164,7 +234,11 @@ way[gauge][gauge !~ /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)
 
 /* the numbers for percentage and degrees include could probably be bracketed a bit more precisely */
 way[incline][incline !~ /^(up|down|-?([0-9]+?(\.[1-9]%)?|100)[%°]?)$/] {
-  throwWarning: tr("unusual incline; use percentages/degrees or up/down");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
+  suggestAlternative: "x%";
+  suggestAlternative: "x°";
+  suggestAlternative: "up";
+  suggestAlternative: "down";
   assertMatch: "way incline=extreme";
   assertNoMatch: "way incline=up";
   assertNoMatch: "way incline=down";
@@ -194,7 +268,7 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node amenity=cinema screen=8";
 }
 *[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node admin_level=0";
   assertMatch: "node admin_level=-1";
   assertMatch: "node admin_level=13";
@@ -204,13 +278,13 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
 /* #14989 */
 *[direction][direction<0],
 *[direction][direction>=360] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node direction=-10";
   assertMatch: "node direction=360";
   assertNoMatch: "node direction=0";
 }
 *[direction][direction !~ /^([0-9][0-9]?[0-9]?|north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)(-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))?(;([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW)-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))*$/] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node direction=north-down";
   assertMatch: "node direction=rome";
   assertMatch: "node direction=C";
@@ -239,7 +313,7 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
 *[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;
+  set ele_meter_remove_autofix;
   assertMatch: "node ele=12m";
   assertMatch: "node ele=12 m";
   assertNoMatch: "node ele=12km";
@@ -248,7 +322,18 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node ele=12";
   assertNoMatch: "node ele=high";
 }
-*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_is_fixable{
+*[ele][ele =~ /^[0-9]+,[0-9][0-9]?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("ele=", replace(tag("ele"), ",", "."));
+  set ele_separator_autofix;
+  assertMatch: "node ele=5,5";
+  assertMatch: "node ele=12,00";
+  assertNoMatch: "node ele=8,848"; /* wrongly used thousands separator */
+  assertNoMatch: "node ele=3,50,5";
+  assertNoMatch: "node ele=3.5";
+  assertNoMatch: "node ele=4";
+}
+*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_meter_remove_autofix!.ele_separator_autofix{
   throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}");
   assertNoMatch: "node ele=12m";
   assertNoMatch: "node ele=12 m";
diff --git a/data/validator/unnecessary.mapcss b/data/validator/unnecessary.mapcss
index 529bd6a..f3d0912 100644
--- a/data/validator/unnecessary.mapcss
+++ b/data/validator/unnecessary.mapcss
@@ -16,7 +16,7 @@
 area:closed[amenity ][area?][!highway],
 area:closed[building][area?],
 area:closed[landuse ][area?][!highway],
-area:closed[leisure ][area?][!highway],
+area:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],
 area:closed[natural ][area?],
 area:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
diff --git a/data_nodist/csv.style b/data_nodist/csv.style
deleted file mode 100644
index 8da299b..0000000
--- a/data_nodist/csv.style
+++ /dev/null
@@ -1,8 +0,0 @@
-FIELD_DELIMITER		WHITESPACE
-RECORD_DELIMITER	NEWLINE
-BADCHARS		COMMA
-
-IFIELD LAT_DECIMAL, "", "%f"
-IFIELD LON_DECIMAL, "", "%f"
-IFIELD ALT_METERS, "", "%f"
-IFIELD IGNORE, "", ""
diff --git a/eclipse/JOSM (Java 8).launch b/eclipse/JOSM (Java 8).launch
index 370e40d..c868fe2 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-DXFImpo [...]
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="&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/build.xml b/i18n/build.xml
index 7def4d5..9ba7e89 100644
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -44,7 +44,28 @@
         </exec>
         <copy file="specialmessages.java" todir="${i18n.build.dir}"/>
     </target>
-    <target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init">
+    <!-- Create the file build/pluginSrc.txt, which contains a list of include patterns for all *.java files that should be translated relative to "${plugin.dir}" -->
+    <target name="filterpluginsources" depends="init">
+        <delete file="${po.build.dir}/pluginSrc.txt"/>
+        <foreach param="path" target="filterpluginsource">
+            <path>
+                <dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
+            </path>
+        </foreach>
+    </target>
+    <!-- Helper task for `filterpluginsources`: Appends an include pattern to the file `build/pluginSrc.txt` if there is no file `.tx/config` for a plugin -->
+    <target name="filterpluginsource">
+      <if>
+          <not>
+              <available file="${path}/.tx/config" type="file" />
+          </not>
+          <then>
+              <basename file="${path}" property="dir"/>
+              <echo file="${po.build.dir}/pluginSrc.txt" append="true" message="${dir}/**/*.java&#xa;"></echo>
+          </then>
+      </if>
+    </target>
+    <target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init,filterpluginsources">
         <gettext-extract keysFile="josm.raw.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
             <!-- core.port -->
             <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
@@ -57,7 +78,7 @@
             <fileset dir="${i18n.build.dir}" includes="trans_plugins.java"/>
             <!-- <fileset dir="${i18n.build.dir}/josmfiles" includes="trans_*.*"/> disable for now -->
             <!-- plugins.pot -->
-            <fileset dir="${plugin.dir}" includes="**/*.java"/>
+            <fileset dir="${plugin.dir}" includesfile="${po.build.dir}/pluginSrc.txt"/>
             <fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
             <fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
         </gettext-extract>
@@ -93,7 +114,7 @@
     </target>
     <target name="po/plugins.pot" description="Extracts message keys from the plugins source code (minus core and data strings)" depends="trans_.java,po/core.pot,po/data.pot,init">
         <gettext-extract keysFile="plugins.raw.pot" poDirectory="${i18n.build.dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
-            <fileset dir="${plugin.dir}" includes="**/*.java"/>
+            <fileset dir="${plugin.dir}" includesfile="${po.build.dir}/pluginSrc.txt"/>
             <fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
             <fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
         </gettext-extract>
@@ -138,6 +159,7 @@
             <arg line="i18n.pl --potfile=po/data.pot --basedir=${i18n_data.install.dir}/ po/*.po"/>
         </exec>
     </target>
+    <!-- If the file `josm.pot` is present and the plugin has a `data/` directory, update its *.po files based on the ones in the `po/` directory. -->
     <target name="plugintrans">
         <basename file="${path}" property="dir"/>
         <mkdir dir="${po.build.dir}/plugin_${dir}"/>
@@ -150,7 +172,10 @@
             <fileset dir="${i18n.build.dir}" includes="trans_${dir}.java"/> <!-- include plugin specific translation -->
         </gettext-extract>
         <if>
-            <available file="${po.build.dir}/plugin_${dir}/josm.pot"/>
+            <and>
+                <available file="${po.build.dir}/plugin_${dir}/josm.pot" type="file"/>
+                <available file="${plugin.dir}/${dir}/data/" type="dir"/>
+            </and>
             <then>
                 <exec executable="perl" failonerror="true">
                     <arg line="i18n.pl --potfile=${po.build.dir}/plugin_${dir}/josm.pot --basedir=${plugin.dir}/${dir}/data/ po/*.po"/>
@@ -181,12 +206,12 @@
         <exec executable="perl" failonerror="true">
             <arg line="launchpad.pl bzronly"/>
         </exec>
-        <antcall target="build"/>       
+        <antcall target="build"/>
     </target>
     <target name="updatecore">
         <exec executable="perl" failonerror="true">
             <arg line="launchpad.pl bzronly"/>
         </exec>
-        <antcall target="buildcore"/>       
+        <antcall target="buildcore"/>
     </target>
 </project>
diff --git a/i18n/i18n.pl b/i18n/i18n.pl
index ef853d3..8e98e4f 100755
--- a/i18n/i18n.pl
+++ b/i18n/i18n.pl
@@ -1,4 +1,5 @@
 #! /usr/bin/perl -w
+# fileformat documentation: JOSM I18n.java function load()
 
 use utf8;
 use strict;
diff --git a/i18n/langinfo.pl b/i18n/langinfo.pl
index 3e064c7..2988384 100755
--- a/i18n/langinfo.pl
+++ b/i18n/langinfo.pl
@@ -1,4 +1,5 @@
 #! /usr/bin/perl -w -CDSL
+# fileformat documentation: JOSM I18n.java function load()
 
 use Term::ReadKey;
 use strict;
diff --git a/i18n/po/af.po b/i18n/po/af.po
index ff894be..0b6d1f6 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-10-13 02:39+0000\n"
 "Last-Translator: Grant Slater <Unknown>\n"
 "Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:33+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:33+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: af\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -947,7 +947,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2245,12 +2245,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8246,9 +8246,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9701,6 +9698,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12743,9 +12743,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14438,6 +14435,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14447,10 +14448,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16274,10 +16271,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17763,6 +17756,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17784,6 +17780,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20437,6 +20436,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23508,6 +23513,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23589,7 +23621,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23604,7 +23636,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23612,21 +23644,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23765,13 +23819,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23804,14 +23858,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23877,7 +23931,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23964,13 +24018,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24138,34 +24192,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24173,7 +24226,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24221,7 +24274,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24229,7 +24282,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24398,8 +24451,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24407,9 +24459,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24417,10 +24467,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24453,57 +24503,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24511,13 +24556,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24585,13 +24630,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24599,7 +24644,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24607,7 +24652,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24615,19 +24660,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24732,13 +24777,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24746,7 +24791,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24840,13 +24885,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24934,6 +24972,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24942,6 +24994,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24949,13 +25025,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24969,7 +25045,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24977,29 +25053,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25068,7 +25143,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25101,6 +25179,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25149,33 +25233,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25183,7 +25265,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25229,25 +25311,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25271,7 +25353,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25367,7 +25449,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25375,6 +25457,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25393,7 +25482,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25455,7 +25544,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25463,13 +25552,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25556,7 +25645,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25564,7 +25660,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25579,6 +25675,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26570,32 +26672,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26604,9 +26702,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26713,6 +26808,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26756,6 +26854,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26789,6 +26890,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26836,6 +26940,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27001,6 +27110,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27790,550 +27902,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29028,6 +28596,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29061,9 +28727,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29076,7 +28763,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29755,6 +29451,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30249,6 +29957,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30281,22 +29992,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30386,6 +30088,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31075,7 +30780,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31108,31 +30831,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32213,6 +31997,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32546,6 +32351,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33283,6 +33091,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33693,12 +33504,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34035,12 +33840,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35581,39 +35380,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35687,9 +35453,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/am.po b/i18n/po/am.po
index db87dec..6861aa5 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2010-03-30 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:34+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:34+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: am\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -947,7 +947,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2245,12 +2245,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8246,9 +8246,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9701,6 +9698,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12743,9 +12743,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14438,6 +14435,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14447,10 +14448,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16274,10 +16271,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17763,6 +17756,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17784,6 +17780,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20437,6 +20436,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23508,6 +23513,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23589,7 +23621,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23604,7 +23636,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23612,21 +23644,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23765,13 +23819,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23804,14 +23858,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23877,7 +23931,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23964,13 +24018,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24138,34 +24192,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24173,7 +24226,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24221,7 +24274,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24229,7 +24282,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24398,8 +24451,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24407,9 +24459,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24417,10 +24467,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24453,57 +24503,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24511,13 +24556,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24585,13 +24630,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24599,7 +24644,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24607,7 +24652,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24615,19 +24660,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24732,13 +24777,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24746,7 +24791,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24840,13 +24885,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24934,6 +24972,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24942,6 +24994,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24949,13 +25025,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24969,7 +25045,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24977,29 +25053,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25068,7 +25143,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25101,6 +25179,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25149,33 +25233,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25183,7 +25265,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25229,25 +25311,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25271,7 +25353,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25367,7 +25449,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25375,6 +25457,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25393,7 +25482,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25455,7 +25544,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25463,13 +25552,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25556,7 +25645,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25564,7 +25660,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25579,6 +25675,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26570,32 +26672,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26604,9 +26702,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26713,6 +26808,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26756,6 +26854,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26789,6 +26890,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26836,6 +26940,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27001,6 +27110,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27790,550 +27902,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29028,6 +28596,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29061,9 +28727,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29076,7 +28763,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29755,6 +29451,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30249,6 +29957,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30281,22 +29992,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30386,6 +30088,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31075,7 +30780,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31108,31 +30831,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32213,6 +31997,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32546,6 +32351,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33283,6 +33091,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33693,12 +33504,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34035,12 +33840,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35581,39 +35380,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35687,9 +35453,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 499c773..4f8fa87 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-06-05 02:55+0000\n"
 "Last-Translator: Chdoula <chdoula at gmail.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:34+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:34+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ar\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -961,8 +961,8 @@ msgstr "أدخل الــ URL للتنزيل:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "طبقة منفصلة"
+msgid "Download as new layer"
+msgstr "نزّل كطبقة جديدة"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "إختار إذا يجب تحميل البيانات إلى طبقة جديدة"
@@ -2263,12 +2263,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8284,9 +8284,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "نزّل كطبقة جديدة"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9742,6 +9739,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12790,9 +12790,6 @@ msgstr "التحم عن بعد"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14489,6 +14486,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14498,10 +14499,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16325,10 +16322,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17814,6 +17807,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17835,6 +17831,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20488,6 +20487,12 @@ msgstr "نافورة"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "منارة"
 
@@ -23559,6 +23564,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23640,7 +23672,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23655,7 +23687,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23663,21 +23695,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23816,13 +23870,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23855,14 +23909,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23928,7 +23982,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -24015,13 +24069,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24189,34 +24243,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24224,7 +24277,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24272,7 +24325,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24280,7 +24333,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24449,8 +24502,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24458,9 +24510,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24468,10 +24518,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24504,57 +24554,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24562,13 +24607,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24636,13 +24681,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24650,7 +24695,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24658,7 +24703,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24666,19 +24711,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24783,13 +24828,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24797,7 +24842,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24891,13 +24936,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24985,6 +25023,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24993,6 +25045,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -25000,13 +25076,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -25020,7 +25096,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -25028,29 +25104,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25119,7 +25194,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25152,6 +25230,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25200,33 +25284,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25234,7 +25316,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25280,25 +25362,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25322,7 +25404,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25418,7 +25500,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25426,6 +25508,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25444,7 +25533,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25506,7 +25595,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25514,13 +25603,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25607,7 +25696,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25615,7 +25711,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25630,6 +25726,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26621,32 +26723,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26655,9 +26753,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26764,6 +26859,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26807,6 +26905,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26840,6 +26941,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26887,6 +26991,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27052,6 +27161,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27841,550 +27953,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29079,6 +28647,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29112,9 +28778,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29127,7 +28814,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29806,6 +29502,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30300,6 +30008,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30332,22 +30043,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30437,6 +30139,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31126,7 +30831,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31159,31 +30882,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32264,6 +32048,27 @@ msgstr "إمتداد الملف غير معروف: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32597,6 +32402,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33334,6 +33142,9 @@ msgstr ""
 msgid "State"
 msgstr "دولة/ولاية"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33744,12 +33555,6 @@ msgstr "القيمة الجديدة لِــ {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34086,12 +33891,6 @@ msgstr ""
 msgid "Presets"
 msgstr "التعيينات المسبقة"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35632,39 +35431,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35738,9 +35504,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 9366c5e..cf47b00 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-11-12 10:06+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: Asturian <ast at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:35+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:35+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ast\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1029,8 +1029,8 @@ msgstr "Escribi la URL a descargar:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Escribi la URL de la que tienen de descargase los datos"
 
-msgid "Separate Layer"
-msgstr "Capa separada"
+msgid "Download as new layer"
+msgstr "Descargar como nueva capa"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Seleicionar si los datos tienen de descargase nuna capa nueva"
@@ -2445,12 +2445,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8926,9 +8926,6 @@ msgstr "Pa la llatitú ríquese un valor nel rangu [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Pa la llonxitú ríquese un valor nel rangu [-90,90]."
 
-msgid "Download as new layer"
-msgstr "Descargar como nueva capa"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10582,6 +10579,9 @@ msgstr "Nun s´atoparon datos nel arquivu ''{0}''."
 msgid "Open OSM file"
 msgstr "Abrir arquivu OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13918,9 +13918,6 @@ msgstr "Control Remotu"
 msgid "Settings for the remote control feature."
 msgstr "Axustes pa la función de control remotu."
 
-msgid "Download objects to new layer"
-msgstr "Descargar los oxetos en capa nueva"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar toles acciones de Control Remotu manualmente."
 
@@ -15838,6 +15835,12 @@ msgstr "Caltener complementu"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Escueya pa caltener el complementu ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Erru al instalar el complementu ''{0}'' dende l´arquivu de descarga temporal "
+"''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Erru al esaniciar los complementos obsoletos ''{0}''."
 
@@ -15849,12 +15852,6 @@ msgstr ""
 "JOSM va cargar la vieya versión del complementu."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Erru al instalar el complementu ''{0}'' dende l´arquivu de descarga temporal "
-"''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17845,10 +17842,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "gabinete"
-
 msgid "Start date"
 msgstr "Fecha d''entamu"
 
@@ -19356,6 +19349,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 octanos"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 octanos"
 
@@ -19377,6 +19373,9 @@ msgstr "E10 (amiestu al 10% de etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (amiestu al 85% de etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Gas licuado de petróleu)"
 
@@ -22034,6 +22033,12 @@ msgstr "Fonte o surtidor ornamental"
 msgid "Water Well"
 msgstr "Pozu d''agua"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Faru"
 
@@ -25131,6 +25136,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25212,7 +25244,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -25227,7 +25259,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -25235,21 +25267,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -25388,13 +25442,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -25427,14 +25481,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -25500,7 +25554,7 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25587,13 +25641,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -25761,34 +25815,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -25796,7 +25849,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -25844,7 +25897,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25852,7 +25905,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -26024,8 +26077,7 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -26033,9 +26085,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -26043,10 +26093,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -26079,57 +26129,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -26137,13 +26182,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -26211,13 +26256,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -26225,7 +26270,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26233,7 +26278,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26241,19 +26286,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -26358,13 +26403,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -26372,7 +26417,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -26466,13 +26511,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26560,6 +26598,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -26568,6 +26620,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26575,13 +26651,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -26595,7 +26671,7 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26603,29 +26679,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -26694,7 +26769,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -26727,6 +26805,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -26775,33 +26859,31 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -26809,7 +26891,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -26855,25 +26937,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -26897,7 +26979,7 @@ msgstr "IDEIB - Balearic Islands"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Canary Islands"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -26993,7 +27075,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -27001,6 +27083,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -27019,7 +27108,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -27081,7 +27170,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -27089,13 +27178,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -27182,7 +27271,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -27190,7 +27286,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27205,6 +27301,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28200,46 +28302,37 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+
 msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: metros ye''l valor por omisión; el puntu ye''l separador; pa otres "
-"unidaes, introduza un espaciu y depués la unidá"
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} format"
-msgstr "formatu {0} inusual"
+msgid "unusual value of {0}"
+msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "el voltaxe tendría de ser en voltios ensin unidaes allindiadores/espacios"
 
-msgid "unusual {0} specification"
-msgstr "especificación {0} inusual"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "anchu de vía de tren inusual, usar mm ensin separación"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "enclín inusual; usar porcentaxes/graos o enriba/embaxo"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} ten de ser un valor numbéricu"
 
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -28346,6 +28439,9 @@ msgstr "Esconder iconos a un nivel baxu d''acercamientu"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Símbolos de nodos más estenos a un nivel baxu d''acercamientu"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Amosar etiquetes de les víes (con zoom altu)"
 
@@ -28397,6 +28493,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -28443,6 +28542,9 @@ msgstr ""
 "Implementa una llínea de comandos y dexa crear los tos comandos. Vea "
 "l''enllaz pa los comandos estándar (arcu, círculu, etc)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28495,6 +28597,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Xestión de EPCIs franceses (llende = autoridá local)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Utilizar scripts esternos en JOSM"
 
@@ -28705,6 +28812,9 @@ msgid ""
 msgstr ""
 "Dexa abrir arquivos gpx/osm que intersectan cola área visible na pantalla."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29570,550 +29680,6 @@ msgstr "Importar imaxe georreferenciada"
 msgid "Error while creating image layer: "
 msgstr "Erru mientres se creaba capar imaxe: "
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "pendiente"
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr "Averar a la imaxe seleicionada"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Averar a la imaxe de Mapillary seleicionada actualmente"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr "Aniciar sesión"
-
-msgid "Logout"
-msgstr "Pesllar sesión"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importar"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -30931,6 +30497,113 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+"Esta ferramienta puede reemplazar namá un nodo, convertir un nodo nuna vía o "
+"multipolígono, o reemplazar una vía con una vía."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Los nodos que pertenecen a vía(s) nun puen reemplazase."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relación nun ye un multipolígono, nun puede ser usada como reemplazu."
+
+msgid "Replace geometry for node {0}"
+msgstr "Reemplazar xeometría pa nodo {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Por favor, escueya una vía qu''esista na base de datos y una vía nueva con "
+"xeometría correcta."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Les víes tienen de tar dafechu dientro de l''área descargá."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"La vía a ser reemplazada nun puede tener nodos con propiedaes o que sían "
+"miembros de relación sacante que pertenezan a dambes víes."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Entepasóse la llende d''iteraciones pal métodu robustu, va procedese col "
+"métodu más simple."
+
+msgid "Replace geometry for way {0}"
+msgstr "Sustituyir la xeometría pa la vía {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "¡Añediéronse demasiaes víes: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -30964,9 +30637,30 @@ msgstr "Etiquetes d''edificaciones"
 msgid "Cannot place building outside of the world."
 msgstr "Nun puede allugar la edificación fora del planeta."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Crear edificación"
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Establecer tamañu de la edificación"
 
@@ -30979,8 +30673,17 @@ msgstr "Autoseleccionar edificación"
 msgid "Use address nodes under buildings"
 msgstr "Usar los nodos dirección debaxo de los edificios"
 
-msgid "Buildings width:"
-msgstr "Anchu de les edificaciones:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Llargor del pasu:"
@@ -31728,6 +31431,18 @@ msgstr "Esaniciar l''esquema escoyíu de la llista"
 msgid "Color Schemes"
 msgstr "Esquemes de color"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Dexar la edición d''etiquetes y pesllar el diálogu"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplicar etiquetes editaes y pesllar diálogu"
+
 msgid "Conflation"
 msgstr "Combinación"
 
@@ -32226,6 +31941,9 @@ msgstr "Abrir el panel de GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Averar pa ver los mensaxes"
 
+msgid "Login"
+msgstr "Aniciar sesión"
+
 msgid "Enable autologin"
 msgstr "Habilitar accesu automáticu"
 
@@ -32258,24 +31976,15 @@ msgstr "Conversación privada"
 msgid "Close tab"
 msgstr "Pesllar pestaña"
 
+msgid "Logout"
+msgstr "Pesllar sesión"
+
 msgid "Clear log"
 msgstr "Llimpiar rexistru"
 
 msgid "Show users on map"
 msgstr "Amosar usuarios nel mapa"
 
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
-msgstr ""
-
-msgid "Data Layer from GeoJSON: "
-msgstr ""
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Solo posición"
 
@@ -32366,6 +32075,9 @@ msgstr "Importar Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importar datos del Globalsat Datalogger DG100 na capa gpx"
 
+msgid "Import"
+msgstr "Importar"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33119,7 +32831,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -33152,31 +32882,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -34356,6 +34147,27 @@ msgstr "Estensión de ficheru desconocía: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "L´analís sintáuticu del arquivu \"{0}\" falló"
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -34697,6 +34509,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35446,6 +35261,9 @@ msgstr "implícitu"
 msgid "State"
 msgstr "Estáu/Provincia"
 
+msgid "pending"
+msgstr "pendiente"
+
 msgid "[incomplete]"
 msgstr "[incompletu]"
 
@@ -35867,12 +35685,6 @@ msgstr "Nuevu valor de {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Falta la preferencia ''{0}''. Non se pue anicializar SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Non pudo abrise la conexón col API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -36239,12 +36051,6 @@ msgstr "Componente JOSM Tag Editor"
 msgid "Presets"
 msgstr "Axustes Predefiníos"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Dexar la edición d''etiquetes y pesllar el diálogu"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplicar etiquetes editaes y pesllar diálogu"
-
 msgid "Highlight"
 msgstr "Resaltar"
 
@@ -37955,48 +37761,6 @@ msgstr ""
 "Esta ferramienta reemplaza la xeometría d''un oxetu con otru, y rique que 2 "
 "y solo 2 oxetos sían escoyíos."
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-"Esta ferramienta puede reemplazar namá un nodo, convertir un nodo nuna vía o "
-"multipolígono, o reemplazar una vía con una vía."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Los nodos que pertenecen a vía(s) nun puen reemplazase."
-
-msgid "Replace geometry for node {0}"
-msgstr "Reemplazar xeometría pa nodo {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relación nun ye un multipolígono, nun puede ser usada como reemplazu."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Por favor, escueya una vía qu''esista na base de datos y una vía nueva con "
-"xeometría correcta."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Les víes tienen de tar dafechu dientro de l''área descargá."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"La vía a ser reemplazada nun puede tener nodos con propiedaes o que sían "
-"miembros de relación sacante que pertenezan a dambes víes."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Entepasóse la llende d''iteraciones pal métodu robustu, va procedese col "
-"métodu más simple."
-
-msgid "Replace geometry for way {0}"
-msgstr "Sustituyir la xeometría pa la vía {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -38074,9 +37838,6 @@ msgstr "Escoyer nodos entemedios"
 msgid "Please select two nodes connected by way!"
 msgstr "¡Por favor, escueya dos nodos conectaos per una vía!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "¡Añediéronse demasiaes víes: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tou lo de dientro"
 
diff --git a/i18n/po/az.po b/i18n/po/az.po
index db01d5b..b2fe334 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2016-12-17 13:38+0000\n"
 "Last-Translator: iAZISS <iss-sash at mail.ru>\n"
 "Language-Team: Azerbaijani <az at li.org>\n"
@@ -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-12-31 04:36+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:36+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -946,7 +946,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2244,12 +2244,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8245,9 +8245,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9700,6 +9697,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12742,9 +12742,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14437,6 +14434,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14446,10 +14447,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16273,10 +16270,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17762,6 +17755,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17783,6 +17779,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20436,6 +20435,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23507,6 +23512,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23588,7 +23620,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23603,7 +23635,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23611,21 +23643,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23764,13 +23818,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23803,14 +23857,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23876,7 +23930,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23963,13 +24017,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24137,34 +24191,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24172,7 +24225,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24220,7 +24273,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24228,7 +24281,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24397,8 +24450,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24406,9 +24458,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24416,10 +24466,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24452,57 +24502,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24510,13 +24555,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24584,13 +24629,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24598,7 +24643,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24606,7 +24651,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24614,19 +24659,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24731,13 +24776,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24745,7 +24790,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24839,13 +24884,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24933,6 +24971,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24941,6 +24993,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24948,13 +25024,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24968,7 +25044,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24976,29 +25052,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25067,7 +25142,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25100,6 +25178,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25148,33 +25232,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25182,7 +25264,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25228,25 +25310,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25270,7 +25352,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25366,7 +25448,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25374,6 +25456,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25392,7 +25481,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25454,7 +25543,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25462,13 +25551,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25555,7 +25644,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25563,7 +25659,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25578,6 +25674,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26569,32 +26671,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26603,9 +26701,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26712,6 +26807,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26755,6 +26853,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26788,6 +26889,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26835,6 +26939,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27000,6 +27109,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27789,550 +27901,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29027,6 +28595,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29060,9 +28726,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29075,7 +28762,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29754,6 +29450,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30248,6 +29956,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30280,22 +29991,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30385,6 +30087,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31074,7 +30779,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31107,31 +30830,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32212,6 +31996,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32545,6 +32350,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33282,6 +33090,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33692,12 +33503,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34034,12 +33839,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35580,39 +35379,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35686,9 +35452,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 1d47ee1..3270518 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-02-19 15:59+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:39+0000\n"
 "Last-Translator: Darafei Praliaskouski <komzpa at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:37+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:37+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: be\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1043,8 +1043,8 @@ msgstr "Пазначце URL для запампоўкі:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Пазначце URL дзе ёсць дадзеныя для запампоўкі"
 
-msgid "Separate Layer"
-msgstr "Асобны пласт"
+msgid "Download as new layer"
+msgstr "Запампаваць як новы пласт"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Ці трэба каб дадзеныя былі запампаваны на асобны пласт"
@@ -2485,12 +2485,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8997,9 +8997,6 @@ msgstr "Значэнне шыраты павінна быць у межах [-90
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Значэнне даўгаты павінна быць у межах  [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Запампаваць як новы пласт"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10681,6 +10678,9 @@ msgstr "Няма дадзеных у файле ''{0}''."
 msgid "Open OSM file"
 msgstr "Адкрыць файл OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -14003,9 +14003,6 @@ msgstr "Дыстанцыйнае кіраванне"
 msgid "Settings for the remote control feature."
 msgstr "Налады Дыстацыйнага кіравання"
 
-msgid "Download objects to new layer"
-msgstr "Запампаваць аб’екты на новы пласт"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Пацвярджаць ўсе дзеянні Дыстацыйнага кіравання ўручную"
 
@@ -15936,6 +15933,12 @@ msgstr "Пакінуць модуль"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Націсніце, каб захаваць модуль ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Не атрымалася ўсталяваць модуль ''{0}'' з часовага файла загрузкі ''{1}''. "
+"{2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Не атрымалася выдаліць састарэлы модуль ''{0}''."
 
@@ -15947,12 +15950,6 @@ msgstr ""
 "загрузіць старую версію модуля."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Не атрымалася ўсталяваць модуль ''{0}'' з часовага файла загрузкі ''{1}''. "
-"{2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17982,10 +17979,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "будка"
-
 msgid "Start date"
 msgstr "Дата запуску"
 
@@ -19494,6 +19487,9 @@ msgstr "біядызель"
 msgid "Octane 80"
 msgstr "бензін АИ-80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "бензін АИ-91"
 
@@ -19515,6 +19511,9 @@ msgstr "E10 (10% сумесь этанолу)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% сумесь этанолу)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "прапан-бутан (АГЗС)"
 
@@ -22171,6 +22170,12 @@ msgstr "Фантан"
 msgid "Water Well"
 msgstr "Студня"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Маяк"
 
@@ -25263,6 +25268,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25344,7 +25376,7 @@ msgstr "OSM Inspector: Адрасы"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "Інспектар OSM: Берагавая лінія (ЕС)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr "Здымкі з imagico.de: горны масіў Праклецце"
 
 msgid ""
@@ -25359,7 +25391,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr "Здымкі з imagico.de: «Паўднёвыя» Трансантарктычныя горы"
 
 msgid ""
@@ -25367,22 +25399,44 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr "Здымкі з imagico.de: горы Пенсакала"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -25521,13 +25575,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -25560,14 +25614,14 @@ msgstr "LPI NSW адміністрацыйныя межы дзяржаўных 
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW адміністрацыйныя межы ахоўваных прыродных зон NPWS"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr "Здымкі з imagico.de: узбярэжжа выспы Херд"
 
 msgid ""
@@ -25633,7 +25687,7 @@ msgstr "VoGIS: Планы"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: вышыні і рэльеф мясцовасці"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr "Здымкі з imagico.de: горныя масівы Рыла і Пірын"
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25720,13 +25774,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Бенін: Катану 2016 (Pleiade)"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bouvet Island"
 msgstr "Здымкі з imagico.de: выспа Буве"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -25894,34 +25948,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Келоўна - оверлэй дарог"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Isla Londonderry"
 msgstr "Здымкі з imagico.de: выспа Ландандэры"
 
 msgid ""
@@ -25929,7 +25982,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr "Здымкі з imagico.de: вулкан Кальбуко"
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -25977,7 +26030,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr "Здымкі з imagico.de: вулкан Алтар"
 
 msgid ""
@@ -25985,7 +26038,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 "Здымкі з imagico.de: выспы Дарвін (Кулпепер) і Вулф (Уэнмен), Галапагос"
 
@@ -26155,33 +26208,27 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Агламерацыя Рур: Аэрафотаздымкі (10 см)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
-"Германіі"
+msgid "imagico.de: Northern German west coast tidalflats"
+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)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
-"imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
-"Германіі (інфрачырвоныя здымкі)"
+"imagico.de: узбярэжныя водмелі Паўночнай Германіі (інфрачырвоныя здымкі)"
 
 msgid ""
 "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"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -26214,35 +26261,33 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Air Base"
 msgstr "Здымкі з imagico.de: авіябаза Туле"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: Thule Airbase DMS low altitude overflight September 2015"
 msgstr ""
 "Здымкі з imagico.de: авіябаза Туле - DMS, аблёт на нізкай вышыні, верасень "
 "2015"
@@ -26251,22 +26296,19 @@ 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr "Здымкі з imagico.de: авіябаза Туле - DMS, аблёт у верасні 2015"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr "Здымкі з imagico.de: авіябаза Туле - DMS, аблёт у кастрычніку 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: 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"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr "Здымкі з imagico.de: Landsat не ў надзіры (травень 2013)"
 
 msgid ""
@@ -26274,13 +26316,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr "Здымкі з imagico.de: поўнач Грэнландыі (ASTER)"
 
 msgid ""
@@ -26348,13 +26390,13 @@ msgstr "OpenStreetMap Вугоршчына (маршруты пешага тур
 msgid "Hillshade Hungary"
 msgstr "Вугоршчына: рэльеф"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr "Здымкі з imagico.de: усход Ісландыі"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr "Здымкі з imagico.de: Качскі Ран"
 
 msgid ""
@@ -26362,7 +26404,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26370,7 +26412,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr "Здымкі з imagico.de: паўднёвы ўсход Сулавесі"
 
 msgid ""
@@ -26378,19 +26420,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr "Здымкі з imagico.de: вадасховішча Бакун"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr "Здымкі з imagico.de: Батам"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -26496,13 +26538,13 @@ msgstr "Японія: ортаздымкі GSI"
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -26510,7 +26552,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr "Здымкі з imagico.de: гара Кенія, 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -26604,13 +26646,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26698,6 +26733,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -26706,6 +26755,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26713,13 +26786,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr "Здымкі з imagico.de: заходняя частка Каракарума"
 
 msgid ""
@@ -26733,7 +26806,7 @@ msgstr "Сектар Газа - Pléiades - 06.07.2014"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Сектар Газа - Pléiades - 06.07.2014 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr "Здымкі з imagico.de: Панамскі канал - ціхаакіянскі бок"
 
 msgid ""
@@ -26741,29 +26814,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Coropuna"
 msgstr "Здымкі з imagico.de: Карапуна"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 "Здымкі з imagico.de: хрыбет Кардыльера-дэ-Вільканота і ледавіковая шапка "
 "Келькая"
@@ -26834,7 +26906,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -26867,6 +26942,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -26915,33 +26996,31 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr "Здымкі з imagico.de: Паўночны і Палярны Урал, жнівень 2016"
 
 msgid ""
@@ -26949,7 +27028,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr "Здымкі з imagico.de: касмадром Усходні"
 
 msgid "Recent image showing newest features (true color)"
@@ -26995,25 +27074,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Паўднёвая Афрыка CD: NGI аэрафотаздымкі"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr "Здымкі з imagico.de: выспа Скота"
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr "Здымкі з imagico.de: выспа Ляскова (Landsat)"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr "Здымкі з imagico.de: Скалы Клерк"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr "Здымкі з imagico.de: Скалы Шаг"
 
 msgid "Catastro Spain"
@@ -27037,7 +27116,7 @@ msgstr "IDEIB - Балеарскія выспы"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Канарскія выспы"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr "Здымкі з imagico.de: Адамаў Мост"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27133,14 +27212,21 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Кантон Базель - ландшафт 10см (2015)"
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
-msgstr "Здымкі з imagico.de: Цэнтральныя Альпы, канец верасня 2016"
+msgid "imagico.de: Central 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 "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Тайвань e-Map Open Data"
 
@@ -27159,7 +27245,7 @@ msgstr "Тайвань Зямельны падзел"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr "Здымкі з imagico.de: Кіліманджара 2016"
 
 msgid "Aşgabat (high resolution)"
@@ -27221,7 +27307,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service - дарогі"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr "Здымкі з imagico.de: Аляскінскі хрыбет"
 
 msgid ""
@@ -27229,13 +27315,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -27322,7 +27408,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr "Здымкі з imagico.de: горы Рувензоры"
 
 msgid ""
@@ -27330,7 +27423,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr "Здымкі з imagico.de: горы Рувензоры, 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27345,6 +27438,12 @@ msgstr "Украіна - Кіеў 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7-я серыя (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition гістарычная"
 
@@ -28373,49 +28472,36 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "значэнні {0} павінны быць толькі лікамі з неабавязковым крокам 0.5"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+
 msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: па змаўчанні ў метрах; падзельнік - пункт; адзінкі вымярэння адлучаюцца "
-"прабелам"
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: тыпова ў тонах; падзельнік - пункт; калі трэба, адзінкі вымярэння "
-"адлучаюцца прабелам"
 
-msgid "unusual {0} format"
-msgstr "незвычайны фармат {0}"
+msgid "unusual value of {0}"
+msgstr "незвычайнае значэнне {0}"
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: тыпова ў кіламетрах; падзельнік - пункт; калі трэба, адзінкі вымярэння "
-"адлучаюцца прабелам"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "напруга павінна быць у вольтах без адзінак/падзельнікаў/прабелаў"
 
-msgid "unusual {0} specification"
-msgstr "незвычайнае апісанне {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "незвычайная шырыня каляіны; выкарыстоўвайце мм без падзельніка"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "незвычайны ўхіл; выкарыстоўвайце адсоткі/градусы ці up/down"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} павінна быць лікавым значэннем"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} павінен быць дадатным цэлым лікам"
 
-msgid "unusual value of {0}"
-msgstr "незвычайнае значэнне {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -28522,6 +28608,9 @@ msgstr "Хаваць значкі на малым маштабе"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Меншае загрувашчванне значкамі на малым маштабе"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Паказваць назвы вуліц (пры  буйных маштабах)"
 
@@ -28577,6 +28666,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -28622,6 +28714,9 @@ msgstr ""
 "Перайдзіце па спасылцы, каб азнаёміцца са стандартнымі камандамі (arc, "
 "circle і г.д.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28678,6 +28773,11 @@ msgstr "Паказвае профіль вышынь і некаторыя ст
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Апрацоўка французскага EPCI (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Выкарыстанне знешніх сцэнарыяў ў JOSM"
 
@@ -28890,6 +28990,9 @@ msgid ""
 msgstr ""
 "Дазваляе адкрываць GPX/OSM файлы, якія перасякаюцца з межамі бягучага экрана"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29768,561 +29871,6 @@ msgstr "Імпартаваць выяву, прывязаную да каард
 msgid "Error while creating image layer: "
 msgstr "Памылка пры стварэнні пласта з малюнкам: "
 
-msgid "Mapillary Images"
-msgstr "Здымкі Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Сцягнуць здымкі Mapillary для бягучага віду"
-
-msgid "Export pictures"
-msgstr "Экспартаваць выявы"
-
-msgid "Export Mapillary pictures"
-msgstr "Экспартаваць выявы Mapillary"
-
-msgid "Export images"
-msgstr "Экспарт здымкаў"
-
-msgid "Import pictures"
-msgstr "Імпартаваць выявы"
-
-msgid "Import local pictures"
-msgstr "Імпартаваць лакальныя выявы"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Імпартаваць выявы на пласт Mapillary"
-
-msgid "Join mode"
-msgstr "Рэжым злучэння"
-
-msgid "Join/unjoin pictures"
-msgstr "Злучыць/раз''яднаць выявы"
-
-msgid "Submit changeset"
-msgstr "Перадаць пакет правак"
-
-msgid "Submit the current changeset"
-msgstr "Перадаць бягучы пакет правак"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Перадаць бягучы пакет правак у Mapillary"
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "у чаканні"
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-"Не атрымалася адправіць пакет правак па версіі пратакола {0} з абмылай: "
-"''{1} {2}''!"
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-"Адбылася абмыла пры спробе адправіць пакет правак на сервер. Калі яна "
-"ўзнікае перыядычна, можаце адправіць справаздачу пра памылку праз меню "
-"Даведка. Калі гэта паведамленне з''явілася ўпершыню, проста паспрабуйце яшчэ "
-"раз: магчыма гэта была праблема з падлучэннем да Інтэрнэту."
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr "Пешаходны рэжым"
-
-msgid "Zoom to selected image"
-msgstr "Маштабаваць да вылучанага здымка"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Наблізіцца да бягучага вылучанага здымка Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr "Бягучы пакет правак Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Адкрыць дыялог набору змен Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Пакет правак Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Адпраўка пакета правак на сервер…"
-
-msgid "Export all images"
-msgstr "Экспартаваць ўсе здымкі"
-
-msgid "Export selected sequence"
-msgstr "Экспартаваць выбраную паслядоўнасць"
-
-msgid "Export selected images"
-msgstr "Экспартаваць выдзеленыя здымкі"
-
-msgid "Rewrite imported images"
-msgstr "Перазапісаць імпартаваныя выявы"
-
-msgid "Select a directory"
-msgstr "Выберыце каталог"
-
-msgid "Explore"
-msgstr "Агляд"
-
-msgid "Speed limit"
-msgstr "Абмежаванне хуткасці"
-
-msgid "Give way"
-msgstr "Даць дарогу"
-
-msgid "No entry"
-msgstr "Заезд забаронены"
-
-msgid "Intersection danger"
-msgstr "Перакрыжаванне з другаснай"
-
-msgid "Mandatory direction (any)"
-msgstr "Кірунак руху"
-
-msgid "Uneven road"
-msgstr "Няроўная дарога"
-
-msgid "No parking"
-msgstr "Стаянка забаронена"
-
-msgid "No overtaking"
-msgstr "Абгон забаронены"
-
-msgid "Pedestrian crossing"
-msgstr "Пешаходны пераход"
-
-msgid "No turn"
-msgstr "Паварот забаронены"
-
-msgid "Years"
-msgstr "Гады"
-
-msgid "Months"
-msgstr "Месяцы"
-
-msgid "Days"
-msgstr "Дні"
-
-msgid "Imported images"
-msgstr "Імпартаваныя выявы"
-
-msgid "Mapillary filter"
-msgstr "Фільтр Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Адкрыць дыялог фільтра Mapillary"
-
-msgid "Not older than: "
-msgstr "Не старэйшыя за: "
-
-msgid "Downloaded images"
-msgstr "Загружаныя здымкі"
-
-msgid "Only images with signs"
-msgstr "Толькі здымкі са знакамі"
-
-msgid "Choose signs"
-msgstr "Выберыце знакі"
-
-msgid "Mapillary history"
-msgstr "Гісторыя Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Адкрыць дыялог гісторыі Mapillary"
-
-msgid "No image selected"
-msgstr "Выява не абрана"
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr "Здымак Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Адкрыць акно Mapillary"
-
-msgid "Next picture"
-msgstr "Наступны здымак"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Паказвае наступны здымак паслядоўнасці"
-
-msgid "Previous picture"
-msgstr "Папярэдні здымак"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Паказвае папярэдні здымак паслядоўнасці"
-
-msgid "Jump to red"
-msgstr "Перайсці да чырвонага"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Перайсці да выявы на другім баку чырвонай лініі"
-
-msgid "Jump to blue"
-msgstr "Перайсці да сіняга"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Перайсці да выявы на другім баку сіняй лініі"
-
-msgid "Stops the walk."
-msgstr "Cпыніць шпацыр."
-
-msgid "Play"
-msgstr "Прайграць"
-
-msgid "Continues with the paused walk."
-msgstr "Працягвае прыпынены шпацыр."
-
-msgid "Pause"
-msgstr "Прыпыніць"
-
-msgid "Pauses the walk."
-msgstr "Прыпыніць шпацыр."
-
-msgid "Display hour when the picture was taken"
-msgstr "Паказваць час, калі быў зроблены здымак"
-
-msgid "Use 24 hour format"
-msgstr "Выкарыстоўваць 24-гадзінны фармат"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Перамяшчацца да месцазнаходжання выявы пры націсканні кнопкак наперад/назад"
-
-msgid "Preview images when hovering its icon"
-msgstr "Перадпрагляд выявы пры навядзенні на яго значок"
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr "Рэжым спампоўкі"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Вы ўвайшлі як ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Вы не выканалі ўваход."
-
-msgid "Login"
-msgstr "Увайсці"
-
-msgid "Logout"
-msgstr "Выйсці"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Перайсці да налад і ўвайсці ў Mapillary перад адпраўкай дадзеных."
-
-msgid "Upload selected sequence"
-msgstr "Адаслаць вылучаную паслядоўнасць"
-
-msgid "Delete after upload"
-msgstr "Выдаліць пасля адпраўкі"
-
-msgid "Wait for full quality pictures"
-msgstr "Чакаць якасных фатаграфій"
-
-msgid "Follow selected image"
-msgstr "Прытрымлівацца вылучанага здымка"
-
-msgid "Go forward"
-msgstr "Ісці наперад"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Імпартаваць"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr "Канфлікт у тэгах"
-
-msgid "Key copied to clipboard"
-msgstr "Ключ скапіраваны ў буфер"
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr "Мне гэта зразумела, зачыніце."
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Выдалена {0} выява"
-msgstr[1] "Выдалена {0} выявы"
-msgstr[2] "Выдалена {0} выяў"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Імпартавана {0} выява"
-msgstr[1] "Імпартавана {0} выявы"
-msgstr[2] "Імпартавана {0} выяў"
-
-msgid "2 images joined"
-msgstr "2 выявы аб''яднаныя"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Перамешчана {0} выява"
-msgstr[1] "Перамешчана {0} выявы"
-msgstr[2] "Перамешчана {0} выяў"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Павернута {0} выява"
-msgstr[1] "Павернута {0} выявы"
-msgstr[2] "Павернута {0} выяў"
-
-msgid "2 images unjoined"
-msgstr "2 выявы раз''яднаныя"
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr "усё ў бачнай вобласці"
-
-msgid "areas with downloaded OSM-data"
-msgstr "вобласці са спампаванымі дадзенымі OSM"
-
-msgid "only when manually requested"
-msgstr "толькі пры запыце ўручную"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr "Сцягванне"
-
-msgid "Select mode"
-msgstr "Рэжым вылучэння"
-
-msgid "Mapillary login"
-msgstr "Уваход у Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Уваход паспяхова выкананы, зварот у JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Падтрымоўваныя фарматы малюнкаў (JPG і PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Загрузка здымкаў Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Усяго здымкаў Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Перадача пакета правак Mapillary"
-
-msgid "No images found"
-msgstr "Выявы не знойдзеныя"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Вы паспяхова загрузілі {0} выяў на mapillary.com"
-
-msgid "Finished upload"
-msgstr "Адсылка скончана"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "Не выкананы ўваход, увайдзіце ў Mapillary у Наладах"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Не выкананы ўваход у Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Адсылаецца: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31140,6 +30688,114 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+"Гэты інструмент ў стане замяняць пункты, абнаўляць пункт да лініі, або лінію "
+"да мультыпалігону, і замяняць лінію лініяй"
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Пункт прыналежыць да лініі(ям), замяніць нельга."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Дачыненне не з''яўляецца мультыпалігоным і не можа выкарыстоўвацца ў якасці "
+"замены."
+
+msgid "Replace geometry for node {0}"
+msgstr "Замяніць геаметрыю для пункта {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Абярыце адну лінію з базы дадзеных і адну лінію, якую вы толькі што "
+"намалявалі"
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Лініі павінны цалкам знаходзіцца ў загружанай вобласці."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Лінія, якая замяняецца, не можа мець пунктаў з тэгамі або пунктаў, якія "
+"з''яўляюцца членамі дачынення, калі толькі яны не належаць абедзьвем гэтым "
+"лініям."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Перавышаны мяжа ітэрацый для надзейнага метаду, выкарыстоўваем просты метад."
+
+msgid "Replace geometry for way {0}"
+msgstr "Замяніць геаметрыю для лініі {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Дададзена занадта шмат ліній: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Генералізацыя будынкаў"
 
@@ -31176,9 +30832,30 @@ msgstr "Тэгі будынкаў:"
 msgid "Cannot place building outside of the world."
 msgstr "Немагчыма змясціць будынак за межамі свету"
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Стварыць будынак"
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Задаць памеры будынкаў"
 
@@ -31191,8 +30868,17 @@ msgstr "Аўта-выбар будынка"
 msgid "Use address nodes under buildings"
 msgstr "Выкарыстоўваць адрасныя пункты пад будынкамі"
 
-msgid "Buildings width:"
-msgstr "Шырыня будынкаў:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Крок даўжыні:"
@@ -31933,6 +31619,18 @@ msgstr "Выдаліць абраную тэму са спісу."
 msgid "Color Schemes"
 msgstr "Каляровыя схемы"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Перапыніць праўку тэгаў і зачыніць дыялог"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Ужыць выпраўленыя тэгі і зачыніць дыялог"
+
 msgid "Conflation"
 msgstr "Аб''яднанне"
 
@@ -32448,6 +32146,9 @@ msgstr "Адкрыць панэль GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Наблізьце, каб убачыць паведамленні"
 
+msgid "Login"
+msgstr "Увайсці"
+
 msgid "Enable autologin"
 msgstr "Уваходзіць аўтаматычна"
 
@@ -32481,24 +32182,15 @@ msgstr "Прыватны чат"
 msgid "Close tab"
 msgstr "Зачыніць укладку"
 
+msgid "Logout"
+msgstr "Выйсці"
+
 msgid "Clear log"
 msgstr "Ачысціць часопіс"
 
 msgid "Show users on map"
 msgstr "Паказаць карыстальнікаў на карце"
 
-msgid "GeoJSON file"
-msgstr "Файл GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Загрузка json-файла..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Пласт даных з GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Памылка загрузкі файла GeoJSON {0}"
-
 msgid "Position only"
 msgstr "Толькі становішча"
 
@@ -32589,6 +32281,9 @@ msgstr "Імпарт з Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Імпартаваць дадзеныя з Globalsat Datalogger DG100 на пласт GPX."
 
+msgid "Import"
+msgstr "Імпартаваць"
+
 msgid "GPS Blams"
 msgstr "Дадзеныя GPS Blam"
 
@@ -33325,8 +33020,26 @@ msgstr "Тып структуры:"
 msgid "Offset into background:"
 msgstr "Зрух адносна падкладкі:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Памочнік малявання ўнутраных памяшканняў"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr ""
 
 msgid "POWER"
 msgstr "МАГУТНАСЦЬ"
@@ -33358,36 +33071,94 @@ msgstr "Значэнне тэга ref, калі вылучаны аб''ект ro
 msgid "Apply Tags"
 msgstr "Ужыць тэгі"
 
-msgid "Fitting"
-msgstr "Падганянне"
+msgid "Add a new level"
+msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
-"<html>Не забудзьцеся напачатку наладзіць зрушэнне планаў "
-"будынка.<br>Выкарыстоўвайце для гэтага модуль PicLayer, які можна ўсталяваць "
-"<br>з дапамогай інструментара кіравання модулямі ў наладах JOSM.</html>"
-
-msgid "Level Selection"
-msgstr "Выбар узроўня"
 
-msgid "Lowest Level"
-msgstr "Самы ніжні ўзровень"
-
-msgid "The lowest level of your building."
-msgstr "Самы ніжні ўзровень будынка."
+msgid "level number:"
+msgstr ""
 
-msgid "Highest Level"
-msgstr "Самы верхні ўзровень"
+msgid "Example: ''2'' or ''3''"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Самы верхні ўзровень будынка."
+msgid "Indoor Mapping Helper"
+msgstr "Памочнік малявання ўнутраных памяшканняў"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Інструменты для малявання ўнутраных памяшканняў"
 
+msgid "Insert level"
+msgstr ""
+
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
+msgstr ""
+
 msgid "InfoMode"
 msgstr "InfoMode"
 
@@ -34554,6 +34325,27 @@ msgstr "Невядомае пашырэнне файла: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Не атрымалася разабраць файл ''{0}''"
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -34894,6 +34686,9 @@ msgstr "Рэдагаваць GPS-дадзеныя здымка"
 msgid "Please select an image first."
 msgstr "Спачатку абярыце выяву."
 
+msgid "No image selected"
+msgstr "Выява не абрана"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Пустыя значэнні выдаляюць адпаведныя палі.)"
 
@@ -35654,6 +35449,9 @@ msgstr "няяўны"
 msgid "State"
 msgstr "Даступныя"
 
+msgid "pending"
+msgstr "у чаканні"
+
 msgid "[incomplete]"
 msgstr "[няпоўны]"
 
@@ -36074,12 +35872,6 @@ msgstr "Новае значэнне для {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Налада ''{0}'' адсутнічае. Немагчыма ініцыялізаваць SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Не атрымалася ўсталяваць злучэнне з API {0}"
-
-msgid "Proxy Authentication Required"
-msgstr "Неабходная аўтарызацыя на проксі"
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -36439,12 +36231,6 @@ msgstr "Модуль рэдагавання тэгаў JOSM"
 msgid "Presets"
 msgstr "Нарыхтоўкі"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Перапыніць праўку тэгаў і зачыніць дыялог"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Ужыць выпраўленыя тэгі і зачыніць дыялог"
-
 msgid "Highlight"
 msgstr "Падсвятліць"
 
@@ -38174,49 +37960,6 @@ msgstr ""
 "Гэты інструмент замяняе геаметрыю аднаго аб’екта геаметрыяй іншага, таму "
 "трэба вылучыць два аб’екты."
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-"Гэты інструмент ў стане замяняць пункты, абнаўляць пункт да лініі, або лінію "
-"да мультыпалігону, і замяняць лінію лініяй"
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Пункт прыналежыць да лініі(ям), замяніць нельга."
-
-msgid "Replace geometry for node {0}"
-msgstr "Замяніць геаметрыю для пункта {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Дачыненне не з''яўляецца мультыпалігоным і не можа выкарыстоўвацца ў якасці "
-"замены."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Абярыце адну лінію з базы дадзеных і адну лінію, якую вы толькі што "
-"намалявалі"
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Лініі павінны цалкам знаходзіцца ў загружанай вобласці."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Лінія, якая замяняецца, не можа мець пунктаў з тэгамі або пунктаў, якія "
-"з''яўляюцца членамі дачынення, калі толькі яны не належаць абедзьвем гэтым "
-"лініям."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Перавышаны мяжа ітэрацый для надзейнага метаду, выкарыстоўваем просты метад."
-
-msgid "Replace geometry for way {0}"
-msgstr "Замяніць геаметрыю для лініі {0}"
-
 msgid "Replace Membership"
 msgstr "Замяніць удзел у дачыненні"
 
@@ -38296,9 +38039,6 @@ msgstr "Абярыце прамежкавыя пункты"
 msgid "Please select two nodes connected by way!"
 msgstr "Калі ласка, вылучыце два пункты злучаныя лініяй!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Дададзена занадта шмат ліній: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Усё ўсярэдзіне [тэставая версія]"
 
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index cbe3deb..07521ac 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-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-28 17:16+0000\n"
-"Last-Translator: Alexander Avtanski <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-19 11:00+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-12-31 04:39+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:38+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: bg\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -998,8 +998,8 @@ msgstr "Въведете URL за сваляне:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Въведете URL откъдето да се свалят данните"
 
-msgid "Separate Layer"
-msgstr "На отделен слой"
+msgid "Download as new layer"
+msgstr "Свали като нов слой"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Изберете дали данните да бъдат свалени в нов слой"
@@ -2355,12 +2355,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -5295,56 +5295,56 @@ msgstr ""
 
 msgctxt "menu"
 msgid "File"
-msgstr ""
+msgstr "Файл"
 
 msgctxt "menu"
 msgid "Edit"
-msgstr ""
+msgstr "Редактиране"
 
 msgctxt "menu"
 msgid "View"
-msgstr ""
+msgstr "Преглед"
 
 msgctxt "menu"
 msgid "Tools"
-msgstr ""
+msgstr "Инструменти"
 
 msgctxt "menu"
 msgid "More tools"
-msgstr ""
+msgstr "Още инструменти"
 
 msgctxt "menu"
 msgid "Data"
-msgstr ""
+msgstr "Данни"
 
 msgctxt "menu"
 msgid "Selection"
-msgstr ""
+msgstr "Избор"
 
 msgctxt "menu"
 msgid "Presets"
-msgstr ""
+msgstr "Шаблони"
 
 msgid "More..."
 msgstr "Още..."
 
 msgctxt "menu"
 msgid "GPS"
-msgstr ""
+msgstr "GPS"
 
 msgctxt "menu"
 msgid "Windows"
-msgstr ""
+msgstr "Прозорци"
 
 msgctxt "menu"
 msgid "Help"
-msgstr ""
+msgstr "Помощ"
 
 msgid "Menu: {0}"
 msgstr "Меню: {0}"
 
 msgid "Main toolbar"
-msgstr ""
+msgstr "Главно меню"
 
 msgid ""
 "Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
@@ -5370,7 +5370,7 @@ msgstr ""
 
 msgctxt "menu"
 msgid "Audio"
-msgstr ""
+msgstr "Аудио"
 
 msgid "Do not hide toolbar"
 msgstr ""
@@ -8405,9 +8405,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Свали като нов слой"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9897,6 +9894,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -11461,19 +11461,19 @@ msgstr ""
 "Трябва да рестартирате JOSM, за да може изменените настройки да подействат."
 
 msgid "Would you like to restart now?"
-msgstr ""
+msgstr "Искате ли да рестартирате сега?"
 
 msgid "Download plugins"
-msgstr ""
+msgstr "Сваляне на добавки"
 
 msgid "Icon paths:"
 msgstr ""
 
 msgid "Name (optional):"
-msgstr ""
+msgstr "Име (по желание)"
 
 msgid "URL / File:"
-msgstr ""
+msgstr "URL / Файл:"
 
 msgid "active"
 msgstr ""
@@ -13001,9 +13001,6 @@ msgstr "Дистанционно"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14705,6 +14702,10 @@ msgstr "Запазване на добавка"
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14714,10 +14715,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16553,10 +16550,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18042,6 +18035,9 @@ msgstr "Био дизел"
 msgid "Octane 80"
 msgstr "А80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Бензин А91"
 
@@ -18063,6 +18059,9 @@ msgstr "E10 (10% етанол)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% етанол)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (втечнен природен газ)"
 
@@ -20716,6 +20715,12 @@ msgstr "Фонтан"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
 
@@ -23789,6 +23794,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -23870,7 +23902,7 @@ msgstr "OSM Inspector: Addresses"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23885,7 +23917,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23893,21 +23925,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -24046,13 +24100,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -24085,14 +24139,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -24158,7 +24212,7 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -24245,13 +24299,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24419,34 +24473,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24454,7 +24507,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24502,7 +24555,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24510,7 +24563,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24681,8 +24734,7 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropole Ruhr: Luftbilder (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24690,9 +24742,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24700,10 +24750,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24736,57 +24786,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24794,13 +24839,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24868,13 +24913,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24882,7 +24927,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24890,7 +24935,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24898,19 +24943,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -25015,13 +25060,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -25029,7 +25074,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -25123,13 +25168,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -25217,6 +25255,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -25225,6 +25277,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -25232,13 +25308,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -25252,7 +25328,7 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -25260,29 +25336,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25351,7 +25426,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25384,6 +25462,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25432,33 +25516,31 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25466,7 +25548,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25512,25 +25594,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25554,7 +25636,7 @@ msgstr "IDEIB - Balearic Islands"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Canary Islands"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25650,7 +25732,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25658,6 +25740,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25676,7 +25765,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25738,7 +25827,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service roads"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25746,13 +25835,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25839,7 +25928,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25847,7 +25943,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25862,6 +25958,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -26853,32 +26955,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26887,9 +26985,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26996,6 +27091,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -27039,6 +27137,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -27072,6 +27173,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27121,6 +27225,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27295,6 +27404,9 @@ msgstr ""
 "Позволява отваряне на gpx/osm файлове, които кръстосват текущо видимата "
 "област на екрана"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28090,550 +28202,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "чакащ"
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr "Отписване"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Импорт"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29328,6 +28896,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29361,9 +29027,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29376,7 +29063,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -30076,6 +29772,18 @@ msgstr "Изтриване на избраната схема от списък
 msgid "Color Schemes"
 msgstr "Цветни схеми"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30570,6 +30278,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30602,24 +30313,15 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
+msgid "Logout"
+msgstr "Отписване"
+
 msgid "Clear log"
 msgstr ""
 
 msgid "Show users on map"
 msgstr ""
 
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
-msgstr ""
-
-msgid "Data Layer from GeoJSON: "
-msgstr ""
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Само позиция"
 
@@ -30710,6 +30412,9 @@ msgstr "Globalsat Импорт"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Импорт данни от Globalsat Datalogger DG100 в GPX слой."
 
+msgid "Import"
+msgstr "Импорт"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31399,7 +31104,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31432,31 +31155,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
+msgstr ""
+
+msgid "level number:"
+msgstr ""
+
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "Level Selection"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Add a new level to layer."
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "<html><b>?</strong></b>"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32553,6 +32337,27 @@ msgstr "Непознато разширение на файл: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -32888,6 +32693,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33625,6 +33433,9 @@ msgstr ""
 msgid "State"
 msgstr "Област/Щат"
 
+msgid "pending"
+msgstr "чакащ"
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34035,12 +33846,6 @@ msgstr "Нова стойност за {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34378,12 +34183,6 @@ msgstr "JOSM Редактор за маркери"
 msgid "Presets"
 msgstr "Шаблони"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr "Подчертване"
 
@@ -35836,10 +35635,10 @@ msgid "Here you can change some preferences of Utilsplugin2 functions"
 msgstr ""
 
 msgid "Save to file"
-msgstr ""
+msgstr "Запис във файл"
 
 msgid "Load from file"
-msgstr ""
+msgstr "Четене от файл"
 
 msgid ""
 "Please edit custom URLs and select one row to use with the tool<br/> "
@@ -35928,39 +35727,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -36034,9 +35800,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index c9e31ae..81e8f53 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-04-03 09:24+0000\n"
 "Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
 "Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:37+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:37+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: bn\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -950,7 +950,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2248,12 +2248,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8249,9 +8249,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9704,6 +9701,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12746,9 +12746,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14441,6 +14438,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14450,10 +14451,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16277,10 +16274,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17766,6 +17759,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17787,6 +17783,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20440,6 +20439,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23511,6 +23516,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23592,7 +23624,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23607,7 +23639,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23615,21 +23647,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23768,13 +23822,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23807,14 +23861,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23880,7 +23934,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23967,13 +24021,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24141,34 +24195,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24176,7 +24229,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24224,7 +24277,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24232,7 +24285,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24401,8 +24454,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24410,9 +24462,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24420,10 +24470,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24456,57 +24506,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24514,13 +24559,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24588,13 +24633,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24602,7 +24647,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24610,7 +24655,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24618,19 +24663,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24735,13 +24780,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24749,7 +24794,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24843,13 +24888,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24937,6 +24975,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24945,6 +24997,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24952,13 +25028,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24972,7 +25048,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24980,29 +25056,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25071,7 +25146,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25104,6 +25182,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25152,33 +25236,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25186,7 +25268,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25232,25 +25314,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25274,7 +25356,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25370,7 +25452,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25378,6 +25460,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25396,7 +25485,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25458,7 +25547,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25466,13 +25555,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25559,7 +25648,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25567,7 +25663,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25582,6 +25678,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26573,32 +26675,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26607,9 +26705,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26716,6 +26811,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26759,6 +26857,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26792,6 +26893,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26839,6 +26943,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27004,6 +27113,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27793,550 +27905,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29031,6 +28599,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29064,9 +28730,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29079,7 +28766,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29758,6 +29454,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30252,6 +29960,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30284,22 +29995,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30389,6 +30091,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31078,7 +30783,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31111,31 +30834,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32216,6 +32000,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32549,6 +32354,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33286,6 +33094,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33696,12 +33507,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34038,12 +33843,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35584,39 +35383,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35690,9 +35456,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/br.po b/i18n/po/br.po
index f018ed8..b5d8b5c 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-10-17 12:11+0000\n"
 "Last-Translator: Fulup <Unknown>\n"
 "Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:38+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:38+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: br\n"
 
 msgid "License"
@@ -947,7 +947,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2245,12 +2245,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8246,9 +8246,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9701,6 +9698,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12743,9 +12743,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14438,6 +14435,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14447,10 +14448,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16274,10 +16271,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17763,6 +17756,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17784,6 +17780,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20437,6 +20436,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23508,6 +23513,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23589,7 +23621,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23604,7 +23636,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23612,21 +23644,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23765,13 +23819,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23804,14 +23858,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23877,7 +23931,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23964,13 +24018,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24138,34 +24192,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24173,7 +24226,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24221,7 +24274,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24229,7 +24282,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24398,8 +24451,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24407,9 +24459,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24417,10 +24467,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24453,57 +24503,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24511,13 +24556,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24585,13 +24630,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24599,7 +24644,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24607,7 +24652,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24615,19 +24660,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24732,13 +24777,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24746,7 +24791,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24840,13 +24885,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24934,6 +24972,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24942,6 +24994,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24949,13 +25025,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24969,7 +25045,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24977,29 +25053,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25068,7 +25143,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25101,6 +25179,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25149,33 +25233,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25183,7 +25265,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25229,25 +25311,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25271,7 +25353,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25367,7 +25449,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25375,6 +25457,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25393,7 +25482,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25455,7 +25544,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25463,13 +25552,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25556,7 +25645,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25564,7 +25660,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25579,6 +25675,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26570,32 +26672,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26604,9 +26702,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26713,6 +26808,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26756,6 +26854,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26789,6 +26890,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26836,6 +26940,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27001,6 +27110,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27790,550 +27902,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29028,6 +28596,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29061,9 +28727,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29076,7 +28763,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29755,6 +29451,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30249,6 +29957,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30281,22 +29992,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30386,6 +30088,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31075,7 +30780,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31108,31 +30831,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32213,6 +31997,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32546,6 +32351,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33283,6 +33091,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33693,12 +33504,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34035,12 +33840,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35581,39 +35380,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35687,9 +35453,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index b9e6f03..1c3c36f 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2012-11-03 23:07+0000\n"
 "Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
 "Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:38+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:37+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: bs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -950,7 +950,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2248,12 +2248,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8249,9 +8249,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9704,6 +9701,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12746,9 +12746,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14441,6 +14438,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14450,10 +14451,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16277,10 +16274,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17766,6 +17759,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17787,6 +17783,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20440,6 +20439,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23511,6 +23516,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23592,7 +23624,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23607,7 +23639,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23615,21 +23647,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23768,13 +23822,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23807,14 +23861,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23880,7 +23934,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23967,13 +24021,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24141,34 +24195,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24176,7 +24229,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24224,7 +24277,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24232,7 +24285,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24401,8 +24454,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24410,9 +24462,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24420,10 +24470,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24456,57 +24506,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24514,13 +24559,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24588,13 +24633,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24602,7 +24647,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24610,7 +24655,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24618,19 +24663,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24735,13 +24780,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24749,7 +24794,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24843,13 +24888,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24937,6 +24975,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24945,6 +24997,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24952,13 +25028,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24972,7 +25048,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24980,29 +25056,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25071,7 +25146,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25104,6 +25182,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25152,33 +25236,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25186,7 +25268,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25232,25 +25314,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25274,7 +25356,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25370,7 +25452,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25378,6 +25460,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25396,7 +25485,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25458,7 +25547,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25466,13 +25555,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25559,7 +25648,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25567,7 +25663,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25582,6 +25678,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26573,32 +26675,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26607,9 +26705,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26716,6 +26811,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26759,6 +26857,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26792,6 +26893,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26839,6 +26943,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27004,6 +27113,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27793,550 +27905,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29031,6 +28599,104 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+
+msgid "Replace geometry for node {0}"
+msgstr ""
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+
+msgid "Replace geometry for way {0}"
+msgstr ""
+
+msgid "Too many ways are added: {0}!"
+msgstr ""
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29064,9 +28730,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr ""
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr ""
 
@@ -29079,7 +28766,16 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
 msgstr ""
 
 msgid "Length step:"
@@ -29758,6 +29454,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr ""
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr ""
+
+msgid "Apply edited tags and close dialog"
+msgstr ""
+
 msgid "Conflation"
 msgstr ""
 
@@ -30252,6 +29960,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30284,22 +29995,13 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
-msgid "Clear log"
-msgstr ""
-
-msgid "Show users on map"
-msgstr ""
-
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
+msgid "Logout"
 msgstr ""
 
-msgid "Data Layer from GeoJSON: "
+msgid "Clear log"
 msgstr ""
 
-msgid "Error loading geojson file {0}"
+msgid "Show users on map"
 msgstr ""
 
 msgid "Position only"
@@ -30389,6 +30091,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31078,7 +30783,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -31111,31 +30834,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32216,6 +32000,27 @@ msgstr ""
 msgid "Parsing file \"{0}\" failed"
 msgstr ""
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr ""
 
@@ -32549,6 +32354,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33286,6 +33094,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33696,12 +33507,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr ""
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -34038,12 +33843,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35584,39 +35383,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr ""
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-
-msgid "Replace geometry for node {0}"
-msgstr ""
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-
-msgid "Replace geometry for way {0}"
-msgstr ""
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -35690,9 +35456,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 0c46c75..e429bc8 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-10-16 08:35+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-12-31 04:39+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:39+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ca\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1030,8 +1030,8 @@ msgstr "Entreu URL per a baixar"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduïu una URL des d''on les dades han de ser baixades"
 
-msgid "Separate Layer"
-msgstr "Capa separada"
+msgid "Download as new layer"
+msgstr "Baixar com una capa nova"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
@@ -2464,12 +2464,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8980,9 +8980,6 @@ msgstr "La latitud ha d''estar compresa entre -90 i 90 graus."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "La laongitud ha d''estar compresa entre -180 i 180 graus."
 
-msgid "Download as new layer"
-msgstr "Baixar com una capa nova"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10629,6 +10626,9 @@ msgstr "No s''han trobat dades al fitxer ''{0}''."
 msgid "Open OSM file"
 msgstr "Obre fitxer OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13980,9 +13980,6 @@ msgstr "Control remot"
 msgid "Settings for the remote control feature."
 msgstr "Configuració de la funció de control remot"
 
-msgid "Download objects to new layer"
-msgstr "Baixar objectes a la nova capa"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar manualment les accions de control remot"
 
@@ -15925,6 +15922,12 @@ msgstr "Conservar el connector"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Feu clic per conservar el connector ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"baixat. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Ha fallat la supressió del connector obsolet ''{0}''."
 
@@ -15936,12 +15939,6 @@ msgstr ""
 "instal·lació. JOSM continuarà carregant la versió anterior del connector."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
-"baixat. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17952,10 +17949,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "quiosc"
-
 msgid "Start date"
 msgstr "Data d''inici"
 
@@ -19466,6 +19459,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 octans"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 octans"
 
@@ -19487,6 +19483,9 @@ msgstr "E10 (10% de mescla d''etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "I85 (85% barreja d''etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (gas liquat de petroli)"
 
@@ -22146,6 +22145,12 @@ msgstr "Font"
 msgid "Water Well"
 msgstr "Pou d''aigua"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Far"
 
@@ -25240,6 +25245,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25321,7 +25353,7 @@ msgstr "Inspector OSM: adreces"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -25336,7 +25368,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -25344,21 +25376,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -25497,13 +25551,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -25536,14 +25590,14 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -25609,7 +25663,7 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25696,13 +25750,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -25870,34 +25924,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna carreteres"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -25905,7 +25958,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -25953,7 +26006,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25961,7 +26014,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -26133,8 +26186,7 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metròpoli del Ruhr: imatgeria aèria (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -26142,9 +26194,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -26152,10 +26202,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -26188,57 +26238,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -26246,13 +26291,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -26320,13 +26365,13 @@ msgstr "OpenStreetMap Hungria (rutes excursionistes)"
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -26334,7 +26379,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26342,7 +26387,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26350,19 +26395,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -26467,13 +26512,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -26481,7 +26526,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -26575,13 +26620,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26669,6 +26707,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -26677,6 +26729,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26684,13 +26760,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -26704,7 +26780,7 @@ msgstr "Franja de Gaza - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Franja de Gaza - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26712,29 +26788,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -26803,7 +26878,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -26836,6 +26914,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -26884,33 +26968,31 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -26918,7 +27000,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -26964,25 +27046,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sud-àfrica CD:NGI Aeri"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -27006,7 +27088,7 @@ msgstr "IDEIB - Illes Balears"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Illes Canàries"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27102,7 +27184,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -27110,6 +27192,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
@@ -27128,7 +27217,7 @@ msgstr "Taiwan Land-Section Data"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -27190,7 +27279,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Carreteres Servei Forestal USA"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -27198,13 +27287,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -27291,7 +27380,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -27299,7 +27395,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27314,6 +27410,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS Nova edició popular històrica"
 
@@ -28325,49 +28427,36 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+
 msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: metres és el valor predefinit; el punt és el separador; en cas "
-"d''unitats, poseu un espai i després la unitat"
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: tona és el predefinit; el separador és el punt; en cas d''unitats poseu "
-"un espai i després les unitats"
 
-msgid "unusual {0} format"
-msgstr "format inusual {0}"
+msgid "unusual value of {0}"
+msgstr "valor no usual per a {0}"
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: quilòmetres és el predefinit; el separador és el punt; en cas "
-"d''unitats poseu un espai i després les unitats"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "el voltatge ha d''estar en volts sense unitat/delimitador/espais"
 
-msgid "unusual {0} specification"
-msgstr "especificació inusual {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "ample de via inusual; utilitzeu mm sense separador"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} ha de ser un valor numèric"
 
 msgid "{0} must be a positive integer number"
 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 ""
 
@@ -28474,6 +28563,9 @@ msgstr "Oculta les icones quan l''ampliació és petita"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Símbols de node menys obstrusius quan l''ampliació és petita"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Mostra els noms dels carrers (a alta resolució)"
 
@@ -28530,6 +28622,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -28575,6 +28670,9 @@ msgstr ""
 "ordres. Utilitzeu l''enllaç per veure les ordres estàndard (arc, cercle, "
 "etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28632,6 +28730,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Manega l''EPCIs francès (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Utilitza scripts externs a JOSM"
 
@@ -28842,6 +28945,9 @@ msgstr ""
 "Permet obrir fitxers gpx/osm que s''interseccionen amb l''àrea visible a "
 "pantalla"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29717,552 +29823,6 @@ msgstr "Importa imatge georeferenciada"
 msgid "Error while creating image layer: "
 msgstr "Error en crear la capa de la imatge: "
 
-msgid "Mapillary Images"
-msgstr "Imatges de Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Capa de Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Descarrega imatges de Mapillary a la vista actual"
-
-msgid "Export pictures"
-msgstr "Exporta imatges"
-
-msgid "Export Mapillary pictures"
-msgstr "Exporta imatges de  Mapillary"
-
-msgid "Export images"
-msgstr "Exporta imatges"
-
-msgid "Import pictures"
-msgstr "Importa imatges"
-
-msgid "Import local pictures"
-msgstr "Importa imatges locals"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importa imatges a la capa de Mapillary"
-
-msgid "Join mode"
-msgstr "Afegeix mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Afegeix/treu fotografies"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "pendent"
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr "Mode caminant"
-
-msgid "Zoom to selected image"
-msgstr "Amplia la imatge seleccionada"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Amplia la imatge seleccionada de Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr "Exporta totes les imatges"
-
-msgid "Export selected sequence"
-msgstr "Exporta la seqüència seleccionada"
-
-msgid "Export selected images"
-msgstr "Exporta les imatges seleccionades"
-
-msgid "Rewrite imported images"
-msgstr "Reescriu les imatges importades"
-
-msgid "Select a directory"
-msgstr "Seleccioneu un directori"
-
-msgid "Explore"
-msgstr "Explora"
-
-msgid "Speed limit"
-msgstr "Límit de velocitat"
-
-msgid "Give way"
-msgstr "Cediu el pas"
-
-msgid "No entry"
-msgstr "Entrada prohibida"
-
-msgid "Intersection danger"
-msgstr "Intersecció"
-
-msgid "Mandatory direction (any)"
-msgstr "Sentit obligatori"
-
-msgid "Uneven road"
-msgstr "Perfil irregular"
-
-msgid "No parking"
-msgstr "Estacionament prohibit"
-
-msgid "No overtaking"
-msgstr "Avançament prohibit"
-
-msgid "Pedestrian crossing"
-msgstr "Pas de vianants"
-
-msgid "No turn"
-msgstr "Gir prohibit"
-
-msgid "Years"
-msgstr "Anys"
-
-msgid "Months"
-msgstr "Mesos"
-
-msgid "Days"
-msgstr "Dies"
-
-msgid "Imported images"
-msgstr "Imatges importades"
-
-msgid "Mapillary filter"
-msgstr "Filtre de Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Obre el diàleg de filtre de  Mapillary"
-
-msgid "Not older than: "
-msgstr "No anteriors a: "
-
-msgid "Downloaded images"
-msgstr "Imatges descarregades"
-
-msgid "Only images with signs"
-msgstr "Només les imatges amb senyals"
-
-msgid "Choose signs"
-msgstr "Selecciona un senyal"
-
-msgid "Mapillary history"
-msgstr "Historial de Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Obre el diàleg de l''historial de Mapillary"
-
-msgid "No image selected"
-msgstr "No heu seleccionat cap imatge"
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr "Fotografia de Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Obre una finestra de Mapillary"
-
-msgid "Next picture"
-msgstr "Imatge següent"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Mostra la següent imatge de la seqüència"
-
-msgid "Previous picture"
-msgstr "Imatge anterior"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Mostra la imatge anterior de la seqüència"
-
-msgid "Jump to red"
-msgstr "Salta al vermell"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Salta a la fotografia de l''altra banda de la línia vermella"
-
-msgid "Jump to blue"
-msgstr "Salta al blau"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Salta a la fotografia de l''altra banda de la línia blava"
-
-msgid "Stops the walk."
-msgstr "Atura la caminada."
-
-msgid "Play"
-msgstr "Reprodueix"
-
-msgid "Continues with the paused walk."
-msgstr "Continua amb la cminada pausada."
-
-msgid "Pause"
-msgstr "Pausa"
-
-msgid "Pauses the walk."
-msgstr "Posa en pausa la caminada."
-
-msgid "Display hour when the picture was taken"
-msgstr "Mostra l''hora a la qual es van fer les fotografies"
-
-msgid "Use 24 hour format"
-msgstr "Utilitza un format de 24 hores"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Mou a la ubicació de les fotografies amb els botons següent/previ"
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr "Mode de descàrrega"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Esteu connectat com ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Ara no esteu connectat."
-
-msgid "Login"
-msgstr "Inici de sessió"
-
-msgid "Logout"
-msgstr "Tanca la sessió"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Aneu a la configuració i inicieu una sessió de Mapillary abans de fer la "
-"pujada."
-
-msgid "Upload selected sequence"
-msgstr "Puja la seqüència seleccionada"
-
-msgid "Delete after upload"
-msgstr "Suprimeix un cop s''hagi pujat"
-
-msgid "Wait for full quality pictures"
-msgstr "Espereu per a imatges de la màxima qualitat"
-
-msgid "Follow selected image"
-msgstr "Segueix la imatge seleccionada"
-
-msgid "Go forward"
-msgstr "Vés endavant"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importa"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Suprimida {0} imatge"
-msgstr[1] "Suprimides {0} imatges"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Importada {0} imatge"
-msgstr[1] "Importades {0} imatges"
-
-msgid "2 images joined"
-msgstr "2 imatges afegides"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} imatge moguda"
-msgstr[1] "{0} imatges mogudes"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} imatge girada"
-msgstr[1] "{0} imatges girades"
-
-msgid "2 images unjoined"
-msgstr "2 imatges tretes"
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr "Descarregant"
-
-msgid "Select mode"
-msgstr "Seleccioneu el mode"
-
-msgid "Mapillary login"
-msgstr "Inici de sessió de Mapillar"
-
-msgid "Login successful, return to JOSM."
-msgstr "Sessió iniciada correctament, retorn a JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Els formats de fitxer suportats  són JPG i PNG"
-
-msgid "Downloading Mapillary images"
-msgstr "Descarregant imatges de Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Nombre total d''imatges de Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr "No s''ha trobat cap imatge"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr "La pujada ha finalitzat"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr "Pujant: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31086,6 +30646,113 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+"Aquesta eina només pot reemplaçar un node, convertir un node en una via o un "
+"multipolígon, o reemplaçar una via per una altra."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "El node forma part d''un o més vies i no és possible reemplaçar-lo."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relació no és un multipolígon i no pot ser utilitzada com a reemplaçament."
+
+msgid "Replace geometry for node {0}"
+msgstr "Reemplaçar la geometria del node {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Si us plau seleccioneu una via existent a la base de dades i una nova via "
+"amb una geometria correcta."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Les vies han de ser completament dins de l''àrea baixada."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"La via a substituir no ha de tenir cap node amb propietats o que siguin part "
+"d''una  relació, tret que pertanyin a les dues vies."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"El límit d''iteració per al mètode estadístic robust ha estat excedit, usant "
+"el mètode simple."
+
+msgid "Replace geometry for way {0}"
+msgstr "Reemplaçar la geometria de la via {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Han estat afegits massa vies: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31119,9 +30786,30 @@ msgstr "Etiquetes d''edificis:"
 msgid "Cannot place building outside of the world."
 msgstr "No és possible de posar un edifici fora del món."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Crea edifici"
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Defineix la mida dels edificis"
 
@@ -31134,8 +30822,17 @@ msgstr "Selecció automàtica d''edifici"
 msgid "Use address nodes under buildings"
 msgstr "Utilitza els nodes d''adreça sota els edificis"
 
-msgid "Buildings width:"
-msgstr "Amplada edificis:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Longitud de l''escala:"
@@ -31887,6 +31584,18 @@ msgstr "Suprimir l''esquema seleccionat de la llista."
 msgid "Color Schemes"
 msgstr "Esquemes de color"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Anul·la l''edició d''etiquetes i tanca la finestra"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplica les etiquetes modificades i tanca la finestra"
+
 msgid "Conflation"
 msgstr "Combinació"
 
@@ -32402,6 +32111,9 @@ msgstr "Open GeoChat panel"
 msgid "Zoom in to see messages"
 msgstr "Amplia per veure missatges"
 
+msgid "Login"
+msgstr "Inici de sessió"
+
 msgid "Enable autologin"
 msgstr "Activa l''inici automàtic de sessió"
 
@@ -32434,24 +32146,15 @@ msgstr "Xat privat"
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
+msgid "Logout"
+msgstr "Tanca la sessió"
+
 msgid "Clear log"
 msgstr "Neteja el registre"
 
 msgid "Show users on map"
 msgstr "Mostra usuaris sobre el mapa"
 
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
-msgstr ""
-
-msgid "Data Layer from GeoJSON: "
-msgstr ""
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Només posició"
 
@@ -32544,6 +32247,9 @@ msgstr "Importa Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importa dades de Globalsat Datalogger DG100 a una capa GPX"
 
+msgid "Import"
+msgstr "Importa"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33295,7 +33001,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -33328,31 +33052,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -34549,6 +34334,27 @@ msgstr "Extensió d''arxiu desconeguda: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "L''anàlisi del fitxer \"{0}\" ha fallat"
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -34893,6 +34699,9 @@ msgstr "Modifica dades GPS de la fotografia"
 msgid "Please select an image first."
 msgstr "Si us plau, seleccioneu primer una fotografia"
 
+msgid "No image selected"
+msgstr "No heu seleccionat cap imatge"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35641,6 +35450,9 @@ msgstr "implícit"
 msgid "State"
 msgstr "Comunitat autònoma/Estat federal"
 
+msgid "pending"
+msgstr "pendent"
+
 msgid "[incomplete]"
 msgstr "[incomplet]"
 
@@ -36068,12 +35880,6 @@ msgstr "Nou valor per {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Manca la preferència ''{0}''. No és possible d''inicialitzar SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Ha fallat l''obertura de la connexió amb l''API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr "Es requereix autenticació a través de servidor intermediari"
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -36441,12 +36247,6 @@ msgstr "Connector JOSM d''edició d''etiquetes"
 msgid "Presets"
 msgstr "Predefinicions"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Anul·la l''edició d''etiquetes i tanca la finestra"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplica les etiquetes modificades i tanca la finestra"
-
 msgid "Highlight"
 msgstr "Ressaltat"
 
@@ -38174,48 +37974,6 @@ msgstr ""
 "Aquesta eina reemplaça la geometria d''un objecte per la d''un altre i "
 "requereix que seleccioneu dos objectes."
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-"Aquesta eina només pot reemplaçar un node, convertir un node en una via o un "
-"multipolígon, o reemplaçar una via per una altra."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "El node forma part d''un o més vies i no és possible reemplaçar-lo."
-
-msgid "Replace geometry for node {0}"
-msgstr "Reemplaçar la geometria del node {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relació no és un multipolígon i no pot ser utilitzada com a reemplaçament."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Si us plau seleccioneu una via existent a la base de dades i una nova via "
-"amb una geometria correcta."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Les vies han de ser completament dins de l''àrea baixada."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"La via a substituir no ha de tenir cap node amb propietats o que siguin part "
-"d''una  relació, tret que pertanyin a les dues vies."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"El límit d''iteració per al mètode estadístic robust ha estat excedit, usant "
-"el mètode simple."
-
-msgid "Replace geometry for way {0}"
-msgstr "Reemplaçar la geometria de la via {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -38294,9 +38052,6 @@ msgstr "Seleccionar els nodes intermedis"
 msgid "Please select two nodes connected by way!"
 msgstr "Si us plau seleccioneu dos nodes connectats per una via !"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Han estat afegits massa vies: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tot l''interior [provant]"
 
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 8d1a593..9d7e731 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-04-25 18:52+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:11+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:11+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ca at valencia\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1022,8 +1022,8 @@ msgstr "Entreu URL per descarregar"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduïu una URL des d''on les dades han de ser descarregades"
 
-msgid "Separate Layer"
-msgstr "Capa separada"
+msgid "Download as new layer"
+msgstr "Descarregar com una capa nova"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
@@ -2435,12 +2435,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8812,9 +8812,6 @@ msgstr "La latitud ha d''estar compresa entre -90 i 90 graus."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "La laongitud ha d''estar compresa entre -180 i 180 graus."
 
-msgid "Download as new layer"
-msgstr "Descarregar com una capa nova"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10464,6 +10461,9 @@ msgstr "No s''han trobat dades al fitxer ''{0}''."
 msgid "Open OSM file"
 msgstr "Obri fitxer OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13808,9 +13808,6 @@ msgstr "Control remot"
 msgid "Settings for the remote control feature."
 msgstr "Configuració de la funció de control remot"
 
-msgid "Download objects to new layer"
-msgstr "Descarregar objectes a la nova capa"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar manualment les accions de control remot"
 
@@ -15727,6 +15724,12 @@ msgstr "Conservar el connector"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Feu clic per conservar el connector ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"descarregat. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Ha fallat la supressió del connector obsolet ''{0}''."
 
@@ -15738,12 +15741,6 @@ msgstr ""
 "instal·lació. JOSM continuarà carregant la versió anterior del connector."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
-"descarregat. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17742,10 +17739,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr "Data d''inici"
 
@@ -19246,6 +19239,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 octans"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 octans"
 
@@ -19267,6 +19263,9 @@ msgstr "E10 (10% de mescla d''etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "I85 (85% barreja d''etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (gas liquat de petroli)"
 
@@ -21922,6 +21921,12 @@ msgstr "Font"
 msgid "Water Well"
 msgstr "Pou d''aigua"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Far"
 
@@ -24993,6 +24998,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -25074,7 +25106,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -25089,7 +25121,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -25097,21 +25129,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -25250,13 +25304,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -25289,14 +25343,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -25362,7 +25416,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25449,13 +25503,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -25623,34 +25677,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -25658,7 +25711,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -25706,7 +25759,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25714,7 +25767,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -25883,8 +25936,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -25892,9 +25944,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -25902,10 +25952,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -25938,57 +25988,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -25996,13 +26041,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -26070,13 +26115,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -26084,7 +26129,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26092,7 +26137,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26100,19 +26145,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -26217,13 +26262,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -26231,7 +26276,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -26325,13 +26370,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26419,6 +26457,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -26427,6 +26479,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26434,13 +26510,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -26454,7 +26530,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26462,29 +26538,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -26553,7 +26628,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -26586,6 +26664,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -26634,33 +26718,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -26668,7 +26750,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -26714,25 +26796,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -26756,7 +26838,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -26852,7 +26934,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -26860,6 +26942,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -26878,7 +26967,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -26940,7 +27029,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -26948,13 +27037,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -27041,7 +27130,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -27049,7 +27145,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27064,6 +27160,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -28055,43 +28157,36 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+
 msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} format"
+msgid "unusual value of {0}"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "el voltatge ha d''estar en volts sense unitat/delimitador/espais"
 
-msgid "unusual {0} specification"
-msgstr ""
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "ample de via inusual; utilitzeu mm sense separador"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
-
 msgid "{0} must be a numeric value"
 msgstr ""
 
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -28198,6 +28293,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -28246,6 +28344,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -28290,6 +28391,9 @@ msgstr ""
 "Implementa una línia d''ordes i habilita la creació de les vostres pròpies "
 "ordes. Utilitzeu l''enllaç per veure les ordes estàndard (arc, cercle, etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28342,6 +28446,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Manega l''EPCIs francés (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Utilitza scripts externs a JOSM"
 
@@ -28546,6 +28655,9 @@ msgstr ""
 "Permet obrir fitxers gpx/osm que s''interseccionen amb l''àrea visible a "
 "pantalla"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29393,550 +29505,6 @@ msgstr "Importa imatge georeferenciada"
 msgid "Error while creating image layer: "
 msgstr "Error en crear la capa de la imatge: "
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "pendent"
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr "Inici de sessió"
-
-msgid "Logout"
-msgstr "Tanca la sessió"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr ""
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importa"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-
-msgid "There are currently no layers with geotagged images!"
-msgstr ""
-
-msgid "Images from my file system"
-msgstr ""
-
-msgid "Select the images you want to import"
-msgstr ""
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr ""
-
-msgid "From existing image layer"
-msgstr ""
-
-msgid "Import exception"
-msgstr ""
-
-msgid "Could not import the image ''{0}''!"
-msgstr ""
-
-msgid "Could not import the directory ''{0}''!"
-msgstr ""
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-
-msgid "Tag conflict"
-msgstr ""
-
-msgid "Key copied to clipboard"
-msgstr ""
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-
-msgid "I got it, close this."
-msgstr ""
-
-msgid "Image info"
-msgstr ""
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr ""
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr ""
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr ""
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr ""
-
-msgid "image has no key"
-msgstr ""
-
-msgid "unknown user"
-msgstr ""
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr ""
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-
-msgid "Downloading map objects failed!"
-msgstr ""
-
-msgid "Mapillary objects"
-msgstr ""
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr ""
-
-msgid "Could not read from URL {0}!"
-msgstr ""
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-
-msgid "everything in the visible area"
-msgstr ""
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr ""
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-
-msgid "Downloading"
-msgstr ""
-
-msgid "Select mode"
-msgstr ""
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr ""
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr ""
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr ""
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr ""
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr ""
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-
-msgid "Not Logged in to Mapillary"
-msgstr ""
-
-msgid "Uploading: {0}"
-msgstr ""
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -30744,6 +30312,113 @@ msgstr ""
 msgid "An unexpected exception occurred:"
 msgstr ""
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+"Esta eina només pot reemplaçar un node, convertir un node en una via o un "
+"multipolígon, o reemplaçar una via per una altra."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "El node forma part d''un o més vies i no és possible reemplaçar-lo."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relació no és un multipolígon i no pot ser utilitzada com a reemplaçament."
+
+msgid "Replace geometry for node {0}"
+msgstr "Reemplaçar la geometria del node {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Per favor seleccioneu una via existent a la base de dades i una nova via amb "
+"una geometria correcta."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Les vies han de ser completament dins de l''àrea descarregada."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"La via a substituir no ha de tindre cap node amb propietats o que siguen "
+"part d''una  relació, tret que pertanyin a les dues vies."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"El límit d''iteració per al mètode estadístic robust ha estat excedit, usant "
+"el mètode simple."
+
+msgid "Replace geometry for way {0}"
+msgstr "Reemplaçar la geometria de la via {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Han estat afegits massa vies: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -30777,9 +30452,30 @@ msgstr "Etiquetes d''edificis:"
 msgid "Cannot place building outside of the world."
 msgstr "No és possible de posar un edifici fora del món."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Crea edifici"
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Defineix la mida dels edificis"
 
@@ -30792,8 +30488,17 @@ msgstr "Selecció automàtica d''edifici"
 msgid "Use address nodes under buildings"
 msgstr "Utilitza els nodes d''adreça sota els edificis"
 
-msgid "Buildings width:"
-msgstr "Amplada edificis:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Longitud de l''escala:"
@@ -31545,6 +31250,18 @@ msgstr "Suprimir l''esquema seleccionat de la llista."
 msgid "Color Schemes"
 msgstr "Esquemes de color"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Anul·la l''edició d''etiquetes i tanca la finestra"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplica les etiquetes modificades i tanca la finestra"
+
 msgid "Conflation"
 msgstr ""
 
@@ -32045,6 +31762,9 @@ msgstr "Open GeoChat panel"
 msgid "Zoom in to see messages"
 msgstr "Amplia per veure missatges"
 
+msgid "Login"
+msgstr "Inici de sessió"
+
 msgid "Enable autologin"
 msgstr "Activa l''inici automàtic de sessió"
 
@@ -32077,24 +31797,15 @@ msgstr "Xat privat"
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
+msgid "Logout"
+msgstr "Tanca la sessió"
+
 msgid "Clear log"
 msgstr "Neteja el registre"
 
 msgid "Show users on map"
 msgstr "Mostra usuaris sobre el mapa"
 
-msgid "GeoJSON file"
-msgstr ""
-
-msgid "Loading json file..."
-msgstr ""
-
-msgid "Data Layer from GeoJSON: "
-msgstr ""
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Només posició"
 
@@ -32187,6 +31898,9 @@ msgstr "Importa Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importa dades de Globalsat Datalogger DG100 a una capa GPX"
 
+msgid "Import"
+msgstr "Importa"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -32937,7 +32651,25 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
+msgid "ConfirmObjectDrawing"
+msgstr ""
+
+msgid "ConfirmMultipolygonSelection"
+msgstr ""
+
+msgid "Please insert a value."
+msgstr ""
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+
+msgid "Relation-Error"
+msgstr ""
+
+msgid "No data selected."
+msgstr ""
+
+msgid "No relation or no relation member with role \"outer\" selected."
 msgstr ""
 
 msgid "POWER"
@@ -32970,31 +32702,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr ""
 
-msgid "Fitting"
+msgid "Add a new level"
 msgstr ""
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
 
-msgid "Level Selection"
+msgid "level number:"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Insert level"
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Add a new level to layer."
+msgstr ""
+
+msgid "<html><b>?</strong></b>"
+msgstr ""
+
+msgid "Show Help-Browser."
+msgstr ""
+
+msgid "Level name"
+msgstr ""
+
+msgid "Sets optional name tag for a level."
+msgstr ""
+
+msgid "Working level: NONE"
+msgstr ""
+
+msgid "Shows the current working level."
+msgstr ""
+
+msgid "Deactivate automatic level tagging."
+msgstr ""
+
+msgid "Sets the name tag."
+msgstr ""
+
+msgid "Sets the referance tag."
+msgstr ""
+
+msgid "Repeat on"
+msgstr ""
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+
+msgid "OUTER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+
+msgid "INNER"
+msgstr ""
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+
+msgid "Deactivate multipolygon function."
+msgstr ""
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -34193,6 +33986,27 @@ msgstr "Extensió d''arxiu desconeguda: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "L''anàlisi del fitxer \"{0}\" ha fallat"
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -34535,6 +34349,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35280,6 +35097,9 @@ msgstr "implícit"
 msgid "State"
 msgstr "Comunitat autònoma/Estat federal"
 
+msgid "pending"
+msgstr "pendent"
+
 msgid "[incomplete]"
 msgstr "[incomplet]"
 
@@ -35705,12 +35525,6 @@ msgstr "Nou valor per {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Manca la preferència ''{0}''. No és possible d''inicialitzar SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Ha fallat l''obertura de la connexió amb l''API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr ""
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -36079,12 +35893,6 @@ msgstr "Connector JOSM d''edició d''etiquetes"
 msgid "Presets"
 msgstr "Predefinicions"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Anul·la l''edició d''etiquetes i tanca la finestra"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplica les etiquetes modificades i tanca la finestra"
-
 msgid "Highlight"
 msgstr "Ressaltat"
 
@@ -37795,48 +37603,6 @@ msgstr ""
 "Esta eina reemplaça la geometria d''un objecte per la d''un altre i "
 "requereix que seleccioneu dos objectes."
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-"Esta eina només pot reemplaçar un node, convertir un node en una via o un "
-"multipolígon, o reemplaçar una via per una altra."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "El node forma part d''un o més vies i no és possible reemplaçar-lo."
-
-msgid "Replace geometry for node {0}"
-msgstr "Reemplaçar la geometria del node {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relació no és un multipolígon i no pot ser utilitzada com a reemplaçament."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Per favor seleccioneu una via existent a la base de dades i una nova via amb "
-"una geometria correcta."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Les vies han de ser completament dins de l''àrea descarregada."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"La via a substituir no ha de tindre cap node amb propietats o que siguen "
-"part d''una  relació, tret que pertanyin a les dues vies."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"El límit d''iteració per al mètode estadístic robust ha estat excedit, usant "
-"el mètode simple."
-
-msgid "Replace geometry for way {0}"
-msgstr "Reemplaçar la geometria de la via {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -37915,9 +37681,6 @@ msgstr "Seleccionar els nodes intermedis"
 msgid "Please select two nodes connected by way!"
 msgstr "Per favor seleccioneu dos nodes connectats per una via !"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Han estat afegits massa vies: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tot l''interior [provant]"
 
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 1947a5f..b7b736c 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-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-18 10:20+0000\n"
-"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-28 10:47+0000\n"
+"Last-Translator: Jezevec <Unknown>\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-12-31 04:39+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:39+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: cs\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1035,8 +1035,8 @@ msgstr "Zadejte URL ke stažení:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Vložte URL, ze kterého mají být stažena data"
 
-msgid "Separate Layer"
-msgstr "Do samostatné vrstvy"
+msgid "Download as new layer"
+msgstr "Stáhnout do nové vrstvy"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Zvolte, pokud mají být data stažena do nové vrstvy"
@@ -2466,17 +2466,17 @@ msgstr "Převést na vrstvu GPX počínaje posledním členem"
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
-"Rekurzivně zploštit tuto relaci do jediné stopy GPX, počínaje prvním členem, "
-"postupně pokračujíc k poslednímu."
+"Rekurzivně zploštit tuto relaci do jedné stopy GPX, počínaje prvním členem a "
+"pokračujíc k poslednímu."
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
-"Rekurzivně zploštit tuto relaci do jediné stopy GPX, počínaje posledním "
-"členem, postupně pokračujíc k prvnímu."
+"Rekurzivně zploštit tuto relaci do jedné stopy GPX, počínaje posledním "
+"členem a pokračujíc k prvnímu."
 
 msgid "Selected Relations"
 msgstr "Zvolené relace"
@@ -8938,9 +8938,6 @@ msgstr "Hodnota zeměpisné šířky musí být v rozmezí [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Hodnota zeměpisné délky musí být v rozmezí [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Stáhnout do nové vrstvy"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10616,6 +10613,9 @@ msgstr "V souboru ''{0}'' nenalezena žádná data."
 msgid "Open OSM file"
 msgstr "Otevřít OSM soubor"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Soubory chyb validace"
 
@@ -10671,10 +10671,10 @@ msgid "Load tile"
 msgstr "Načíst dlaždici"
 
 msgid "Get tile status"
-msgstr "Stav získání dlaždice"
+msgstr "Stav dlaždice"
 
 msgid "Force tile rendering"
-msgstr "Vynutit vykreslení dlaždice"
+msgstr "Vynutit překreslení dlaždice"
 
 msgid "Failed to create tile source"
 msgstr "Selhalo vytvoření zdroje dlaždice"
@@ -13955,9 +13955,6 @@ msgstr "Vzdálené ovládání"
 msgid "Settings for the remote control feature."
 msgstr "Nastavení funkce vzdáleného ovládání."
 
-msgid "Download objects to new layer"
-msgstr "Stahovat objekty do nové vrstvy"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Potvrzovat ručně všechny akce vzdáleného ovládání"
 
@@ -15448,10 +15445,10 @@ msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Ano, vždy"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Ano, jednou"
 
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci vzdáleného ovládání"
@@ -15849,6 +15846,12 @@ msgstr "Doplněk ponechat"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Kliknutím si ponecháte doplněk ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Nepodařilo se nainstalovat doplněk ''{0}'' z dočasného staženého souboru "
+"''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Nepodařilo se smazat zastaralý doplněk ''{0}''."
 
@@ -15860,12 +15863,6 @@ msgstr ""
 "přeskakuji. JOSM bude dále používat starou verzi doplňku."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Nepodařilo se nainstalovat doplněk ''{0}'' z dočasného staženého souboru "
-"''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17896,10 +17893,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "na střeše"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "v budce"
-
 msgid "Start date"
 msgstr "Uvedena do provozu"
 
@@ -19407,6 +19400,9 @@ msgstr "Bionafta"
 msgid "Octane 80"
 msgstr "80 oktanů"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 oktanů"
 
@@ -19428,6 +19424,9 @@ msgstr "E10 (10% směs etanolu)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% směs etanolu)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (propan-butan)"
 
@@ -22083,6 +22082,12 @@ msgstr "Fontána"
 msgid "Water Well"
 msgstr "Studna"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Maják"
 
@@ -25182,6 +25187,36 @@ msgstr "OpenSnowMap overlay"
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr "Overlay imagery for piste mapping in OSM. Updated daily."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Překryvná vrstva pro mapování železnic v OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Telecoms"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Power"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Petroleum"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25263,8 +25298,8 @@ msgstr "OSM Inspector: Adresy"
 msgid "OSM Inspector: Coastline (EU)"
 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 "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije Mountains"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25281,8 +25316,8 @@ msgid ""
 msgstr ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Southern Transantarctic Mountains"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25291,22 +25326,44 @@ 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: Pensacola Mountains"
+msgstr "imagico.de: Pensacola Mountains"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: Elephant Island/Clarence Island"
+msgstr "imagico.de: 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 "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
+msgstr "imagico.de: Enderby Land and Kemp Coast"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr "Snímky Sentinel-2 oblasti Enderby Land a Kemp Coast (pravé barvy)"
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr "IGN topographical map (TMS)"
 
@@ -25445,14 +25502,14 @@ msgstr "Ministry of Agroindustry (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Ministry of Energy and Mining (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (low tide)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Tidal flats and islands at the coast (true color)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (high tide)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI černobíle 2.5m"
@@ -25484,16 +25541,16 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: 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 "imagico.de: Heard Island coast"
+msgstr "imagico.de: Heard Island coast"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25561,8 +25618,8 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Höhen und Gelände"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Rila and Pirin Mountains"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (belgický styl)"
@@ -25648,15 +25705,15 @@ msgstr "TEC bus stops"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: 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 "imagico.de: Bouvet Island"
+msgstr "imagico.de: 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)"
@@ -25826,38 +25883,36 @@ 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 "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: 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 "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: 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 "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: 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 "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: 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 "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Isla Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -25866,8 +25921,8 @@ 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 "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Volcán Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Snímek po erupci roku 2015 (pravé barvy)"
@@ -25914,8 +25969,8 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
@@ -25924,9 +25979,8 @@ 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 "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: Darwin and Wolf islands, Galapagos"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26098,10 +26152,8 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropole Ruhr: Luftbilder (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: Northern German west coast tidalflats"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26110,12 +26162,8 @@ msgstr ""
 "Aktuální snímky pobřeží za nízkého přílivu pro aktualizaci mapování "
 "wattového pobřeží a mělčin (pravé barvy)"
 
-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: Northern German west coast tidalflats (infrared)"
+msgstr "imagico.de: Northern German west coast tidalflats (infrared)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26124,11 +26172,11 @@ msgstr ""
 "Aktuální snímky pobřeží za nízkého přílivu pro aktualizaci mapování "
 "wattového pobřeží a mělčin (falešné barvy IČ)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: North Sea Coast 2016"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: North Sea Coast 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Saxony latest aerial imagery"
@@ -26160,66 +26208,56 @@ msgstr "Mainz latest aerial imagery"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Munich latest aerial imagery 60cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: 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 "imagico.de: Thule Air Base"
+msgstr "imagico.de: 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: Kangerlussuaq Autumn"
-msgstr "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Kangerlussuaq Autumn"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Kangerlussuaq Spring"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
-msgstr ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: Thule Airbase DMS low altitude overflight September 2015"
+msgstr "imagico.de: Thule Airbase DMS low altitude overflight 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 ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr "imagico.de: Thule Airbase DMS overflight September 2015"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: Thule Airbase DMS overflight October 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: 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 "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: May 2013 off-nadir Landsat"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26228,14 +26266,14 @@ 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 "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: 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 "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Northern Greenland ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26304,14 +26342,14 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
 msgid "Hillshade Hungary"
 msgstr "Hillshade Hungary"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: 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 "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann of Kutch"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -26320,8 +26358,8 @@ msgstr ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
 "(false color IR)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: Sudirman Range 2015"
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26330,8 +26368,8 @@ msgstr ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
 "(true color)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: Southeastern Sulawesi"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
@@ -26340,20 +26378,20 @@ 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 "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: 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 "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Missing Islands in OSM (true color)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: Sudirman Range 2016"
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -26460,14 +26498,14 @@ msgstr "Japan GSI ortho Imagery"
 msgid "Japan GSI Standard Map"
 msgstr "Japan GSI Standard Map"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Aral Sea (low water level)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "Water and wetland extents, dams etc. (true color)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: Aral Sea (high water level)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
@@ -26476,8 +26514,8 @@ msgstr ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
 "north (true color)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr "imagico.de: Mount Kenya 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "Up-to-date image for glacier mapping (true color)"
@@ -26580,14 +26618,6 @@ msgid ""
 msgstr ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr "Kartverket DTM Digital Terrain Model"
 
@@ -26619,12 +26649,14 @@ msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
 msgstr "Historic maps - for the time being `Amtskartserien´ 1826-1917."
 
 msgid "Kartverket Economic Maps (historic)"
-msgstr ""
+msgstr "Kartverket Economic Maps (historic)"
 
 msgid ""
 "1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
 "kartverk´). Available from zoom 16. Please correct local imagery offset."
 msgstr ""
+"1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
+"kartverk´). Available from zoom 16. Please correct local imagery offset."
 
 msgid "Kartverket Administrative Boundaries overlay"
 msgstr "Kartverket Administrative Boundaries overlay"
@@ -26633,6 +26665,8 @@ msgid ""
 "Official administrative boundaries at the national, county and municipality "
 "levels"
 msgstr ""
+"Official administrative boundaries at the national, county and municipality "
+"levels"
 
 msgid "Kartverket Cadastral overlay"
 msgstr "Kartverket Cadastral overlay"
@@ -26645,12 +26679,14 @@ msgstr ""
 "Monthly update."
 
 msgid "Kartverket Aviation Obstructions overlay"
-msgstr ""
+msgstr "Kartverket Aviation Obstructions overlay"
 
 msgid ""
 "Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
 "urban areas (e.g. masts, towers, high buildings, power lines)"
 msgstr ""
+"Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
+"urban areas (e.g. masts, towers, high buildings, power lines)"
 
 msgid "NVE Electricity Network overlay"
 msgstr "NVE Electricity Network overlay"
@@ -26681,12 +26717,30 @@ msgstr ""
 "denied."
 
 msgid "NPD Offshore Installations overlay"
-msgstr ""
+msgstr "NPD Offshore Installations overlay"
 
 msgid ""
 "Production platforms and oil/natural gas fields on the Norwegian continental "
 "shelf"
 msgstr ""
+"Production platforms and oil/natural gas fields on the Norwegian continental "
+"shelf"
+
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr "Kystverket Navigational Aid overlay"
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
 
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr "Miljødirektoratet Protected Areas overlay"
@@ -26698,6 +26752,33 @@ msgstr ""
 "Norwegian national parks, nature reserves and other protected areas and "
 "objects from Naturbase, including Svalbard/Spitsbergen"
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr "Riksantikvaren Heritage Sites overlay"
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr "SSB Urban Areas overlay"
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+
 msgid "NP Svalbard Orthophoto"
 msgstr "NP Svalbard Orthophoto"
 
@@ -26706,14 +26787,14 @@ msgid ""
 msgstr ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: Svalbard mosaic"
 
 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 "imagico.de: Western Karakoram"
+msgstr "imagico.de: Western Karakoram"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -26728,8 +26809,8 @@ msgstr "Gaza Strip - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: Panama Canal - Pacific side"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -26738,31 +26819,29 @@ 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 "imagico.de: Panama Canal"
+msgstr "imagico.de: 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 "imagico.de: Vanatinai"
+msgstr "imagico.de: 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 "imagico.de: New Ireland"
+msgstr "imagico.de: 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"
+msgid "imagico.de: Coropuna"
+msgstr "imagico.de: Coropuna"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
-msgstr ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: 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)"
@@ -26783,7 +26862,7 @@ msgid "Geoportal 2: ISOK hillshade"
 msgstr "Geoportal 2: ISOK hillshade"
 
 msgid "polska.e-mapa.net: Buildings"
-msgstr ""
+msgstr "polska.e-mapa.net: Buildings"
 
 msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr "Będzin: Orthophotomap 2013 (aerial image)"
@@ -26830,8 +26909,11 @@ msgstr "Katowice: Buildings"
 msgid "Łódź: Buildings"
 msgstr "Łódź: Buildings"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Łódź: Orthophotomap 2015 (aerial image)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Łódź: Orthophotomap 2017 (aerial image)"
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Powiat dębicki: Buildings"
@@ -26863,6 +26945,12 @@ msgstr "Powiat stalowowolski: Buildings"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Poznań: Orthophotomap 2014 (aerial image)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Poznań: Orthophotomap 2016 (aerial image)"
+
+msgid "Poznań: Buildings"
+msgstr "Poznań: Buildings"
+
 msgid "Przemyśl: Buildings"
 msgstr "Przemyśl: Buildings"
 
@@ -26911,37 +26999,33 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: 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 "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: 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 "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: 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 Dvina delta at low tide"
-msgstr "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: Northern Dvina delta at low tide"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr "Beaches, tidal flats and other costal forms (true color)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: Northern and Polar Ural mountains August 2016"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -26950,8 +27034,8 @@ 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: Vostochny Cosmodrome"
+msgstr "imagico.de: Vostochny Cosmodrome"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Recent image showing newest features (true color)"
@@ -27000,26 +27084,26 @@ 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 "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: 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 "imagico.de: Scott Island"
+msgstr "imagico.de: 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"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: Leskov Island Landsat"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: Clerke Rocks"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: Shag Rocks"
 
 msgid "Catastro Spain"
 msgstr "Catastro Španělsko"
@@ -27042,8 +27126,8 @@ msgstr "IDEIB - Baleáry"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Kanárské ostrovy"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Adams Bridge"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr "Supplementing incomplete coverage in other sources (true color)"
@@ -27138,9 +27222,8 @@ msgstr "Kanton Basel-Stadt 2017"
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Kanton Basel-Landschaft 10cm (2015)"
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central 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 "
@@ -27149,6 +27232,13 @@ msgstr ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
 "altitudes (true color)"
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr "Taiwan e-Map Open Data"
 
@@ -27167,8 +27257,8 @@ msgstr "Taiwan Land-Section Data"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: Mount Kilimanjaro 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr "Aşgabat (high resolution)"
@@ -27240,8 +27330,8 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service roads"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: Alaska Range"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
@@ -27250,14 +27340,14 @@ msgstr ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
 "color)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: Bogoslof Island"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "Recent image from after the eruption (true color)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: Cook Inlet"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -27358,8 +27448,16 @@ msgstr ""
 "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 "NYS Orthos Online"
+msgstr "NYS Orthos Online"
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: Rwenzori Mountains"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27368,8 +27466,8 @@ 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"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: Rwenzori Mountains 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
@@ -27383,6 +27481,12 @@ msgstr "Ukraine - Kyiv 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28546,51 +28650,37 @@ msgstr "{0} by měla být celočíselná hodnota mezi -5 a 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} by měla mít jen čísla s volitelným přírůstkem o 0.5"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+
 msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: předpokládají se metry; oddělení desetinných míst tečkou; pokud udáváte "
-"jednotky, pak před nimi vložte mezeru"
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr "{0}: tuna je výchozí; oddělovačem je tečka; jednotky oddělte mezerou"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
+msgstr ""
 
-msgid "unusual {0} format"
-msgstr "neobvyklý formát {0}"
+msgid "unusual value of {0}"
+msgstr "neobvyklá hodnota {0}"
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
-"{0}: kilometr je výchozí; oddělovačem je tečka; jednotky oddělte mezerou"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "napětí má být ve voltech bez jakýchkoliv jednotek,oddělovačů či mezer"
 
-msgid "unusual {0} specification"
-msgstr "neobvyklá specifikace {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-"neobvyklý rozchod kolejí (gauge); použijte hodnotu v mm bez jakéhokoliv "
-"oddělovače"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"neobvyklé stoupání (incline); použijte procenta, stupně nebo \"up\" či "
-"\"down\""
-
 msgid "{0} must be a numeric value"
 msgstr "{0} musí být číselná hodnota"
 
 msgid "{0} must be a positive integer number"
 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 "{0} musí být číselná hodnota v metrech a bez uvedených jednotek"
 
@@ -28706,6 +28796,9 @@ msgstr "Skrýt ikony v malém přiblížení"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Méně výrazné symboly uzlů v malém zvětšení"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr "Skrýt označkované uzly cest v nízkém přiblížení"
+
 msgid "Display street labels (at high zoom)"
 msgstr "Zobrazit popisky ulic (ve vysokém přiblížení)"
 
@@ -28762,6 +28855,9 @@ msgstr ""
 "Automaticky přiřazuje adresy vybraných objektům v Rakousku. Data © "
 "Österreichisches Adressregister 2017, N 23806/2017."
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -28808,6 +28904,9 @@ msgstr ""
 "Implementuje příkazový řádek a umožňuje tvorbu vlastních příkazů. Kliknutím "
 "na odkaz zjistíte více informací o základních příkazech (oblouk, kruh atd.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Nástroj pro spojování dat (párování a slučování)"
 
@@ -28865,6 +28964,12 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Používá Francouzský EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+"Poskytuje sběrnici událostí schopnější než je tradiční registrace naslouchačů"
+
 msgid "Use external scripts in JOSM"
 msgstr "Použití externích skriptů v JOSM"
 
@@ -29072,6 +29177,9 @@ msgid ""
 msgstr ""
 "Otevírá soubory gpx/osm které se protínají se současnou viditelnou oblastí."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29941,578 +30049,6 @@ msgstr "Import georeferenčního obrázku"
 msgid "Error while creating image layer: "
 msgstr "Chyba při vytváření obrazu vrstvy: "
 
-msgid "Mapillary Images"
-msgstr "Obrázky Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Vrstva Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} sekvencí, každá obsahuje mezi {1} a {2} obrázky (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} importovaných obrázků"
-
-msgid "{0} downloaded images"
-msgstr "{0} stažených obrázků"
-
-msgid "{0} images in total"
-msgstr "{0} obrázků celkem"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} obrázků ve {1} sekvencích"
-
-msgid "Mapillary object layer"
-msgstr "Vrstva objektů Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Zobrazí vrstvu, ve které jsou mapové objekty detekované Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Otevřená vrstva Mapillary"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Stáhnout obrázky Mapillary v aktuálním zobrazení"
-
-msgid "Export pictures"
-msgstr "Exportovat obrázky"
-
-msgid "Export Mapillary pictures"
-msgstr "Export obrázků Mapillary"
-
-msgid "Export images"
-msgstr "Exportovat obrázky"
-
-msgid "Import pictures"
-msgstr "Importovat obrázky"
-
-msgid "Import local pictures"
-msgstr "Import lokálních obrázků"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importovat obrázky do vrstvy Mapillary"
-
-msgid "Join mode"
-msgstr "Režim slučování"
-
-msgid "Join/unjoin pictures"
-msgstr "Sloučit/rozdělit obrázky"
-
-msgid "Submit changeset"
-msgstr "Odeslat sadu změn"
-
-msgid "Submit the current changeset"
-msgstr "Odeslat aktuální sadu změn"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Odeslat aktuální sadu změn na Mapillary"
-
-msgid "rejected"
-msgstr "zamítnuto"
-
-msgid "pending"
-msgstr "čekající"
-
-msgid "approved"
-msgstr "schváleno"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} obrázků předáno, klíč sady změn: {1}, stav: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "Nahrání sady změn na server selhalo s {0} chybou ''{1} {2}''!"
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-"Při pokusu o odeslání sady změn na server došlo k výjimce. Pokud k tomu "
-"dojde opakovaně, zvažte zaslání hlášení o chybě pomocí menu Nápověda. Pokud "
-"tuto zprávu vidíte poprvé, tak to prostě zkuste udělat znovu. Může se jednat "
-"o problém s připojením k Internetu."
-
-msgid "Upload Mapillary images"
-msgstr "Nahrát na server obrázky Mapillary"
-
-msgid "Walk mode"
-msgstr "Režim chůze"
-
-msgid "Zoom to selected image"
-msgstr "Zvětšit na zvolený obrázek"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zvětšit na aktuálně zvolený obrázek Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr "Aktuální sada změn Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Otevřít dialog sady změn Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Sada změn Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Odesílám sadu změn na server…"
-
-msgid "Export all images"
-msgstr "Exportovat všechny obrázky"
-
-msgid "Export selected sequence"
-msgstr "Exportovat vybranou sekvenci"
-
-msgid "Export selected images"
-msgstr "Exportovat zvolené obrázky"
-
-msgid "Rewrite imported images"
-msgstr "Přepsat importované obrázky"
-
-msgid "Select a directory"
-msgstr "Zvolte adresář"
-
-msgid "Explore"
-msgstr "Prozkoumat"
-
-msgid "Speed limit"
-msgstr "Omezení rychlosti"
-
-msgid "Give way"
-msgstr "Dej přednost"
-
-msgid "No entry"
-msgstr "Zákaz vjezdu"
-
-msgid "Intersection danger"
-msgstr "Upozornění na křižovatku"
-
-msgid "Mandatory direction (any)"
-msgstr "Přikázaný směr jízdy (jakýkoliv)"
-
-msgid "Uneven road"
-msgstr "Nerovnost vozovky"
-
-msgid "No parking"
-msgstr "Zákaz parkování"
-
-msgid "No overtaking"
-msgstr "Zákaz předjíždění"
-
-msgid "Pedestrian crossing"
-msgstr "Přechod pro chodce"
-
-msgid "No turn"
-msgstr "Zákaz odbočení"
-
-msgid "Years"
-msgstr "Let"
-
-msgid "Months"
-msgstr "Měsíců"
-
-msgid "Days"
-msgstr "Dnů"
-
-msgid "Imported images"
-msgstr "Importované obrázky"
-
-msgid "Mapillary filter"
-msgstr "Filtr Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Otevřít okno filtru Mapillary"
-
-msgid "Not older than: "
-msgstr "Ne starší než: "
-
-msgid "Downloaded images"
-msgstr "Stažené obrázky"
-
-msgid "Only images with signs"
-msgstr "Pouze obrázky se značkami"
-
-msgid "Choose signs"
-msgstr "Zvolit značky"
-
-msgid "Mapillary history"
-msgstr "Historie Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Otevřít dialog historie Mapillary"
-
-msgid "No image selected"
-msgstr "Nebyl vybrán žádný obrázek"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Stiskněte \"{0}\" pro stažení obrázků"
-
-msgid "Mapillary picture"
-msgstr "Obrázek Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Otevřít okno Mapillary"
-
-msgid "Next picture"
-msgstr "Další obrázek"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Ukáže další obrázek v sekvenci"
-
-msgid "Previous picture"
-msgstr "Předchozí obrázek"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Ukáže předchozí obrázek v sekvenci"
-
-msgid "Jump to red"
-msgstr "Skočit na červenou"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Skočí na obrázek na druhé straně červené čáry"
-
-msgid "Jump to blue"
-msgstr "Skočit na modrou"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Skočí na obrázek na druhé straně modré čáry"
-
-msgid "Stops the walk."
-msgstr "Ukončí průchod."
-
-msgid "Play"
-msgstr "Přehrát"
-
-msgid "Continues with the paused walk."
-msgstr "Pokračuje v pozastaveném průchodu."
-
-msgid "Pause"
-msgstr "Pozastavit"
-
-msgid "Pauses the walk."
-msgstr "Pozastaví průchod."
-
-msgid "Display hour when the picture was taken"
-msgstr "Zobrazit hodinu, kdy byl obrázek pořízen"
-
-msgid "Use 24 hour format"
-msgstr "Použít 24hodinový formát"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Přesunout se na umístění obrázku tlačítky další/předchozí"
-
-msgid "Preview images when hovering its icon"
-msgstr "Nahlédnout obrázek při ukázání na jeho ikonu"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Useknout sekvence na hranicích stahování"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"Při otevírání obrázku Mapillary v internetovém prohlížeči zobrazit namísto "
-"prohlížeče obrázků editor rozmazání."
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr "Povolit experimentální beta-funkce (může být nestabilní)"
-
-msgid "Download mode"
-msgstr "Režim stahování"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Počet snímků, která se mají načíst dopředu (vpřed a vzad)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Jste přihlášen jako ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Momentálně nejste přihlášen."
-
-msgid "Login"
-msgstr "Přihlásit se"
-
-msgid "Logout"
-msgstr "Odhlásit se"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Jděte do nastavení a před nahráváním se přihlašte na Mapillary."
-
-msgid "Upload selected sequence"
-msgstr "Nahrát vybranou sekvenci"
-
-msgid "Delete after upload"
-msgstr "Smazat po nahrání"
-
-msgid "Wait for full quality pictures"
-msgstr "Počkat na obrázek v maximální kvalitě"
-
-msgid "Follow selected image"
-msgstr "Následovat vybraný obrázek"
-
-msgid "Go forward"
-msgstr "Vpřed"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "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 "{0} ({1} images)"
-msgstr "{0} ({1} obrázků)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-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 "Obrázky z mého souborového systému"
-
-msgid "Select the images you want to import"
-msgstr "Zvolte obrázky, které chcete importovat"
-
-msgid "All images in a directory"
-msgstr "Všechny obrázky v adresáři"
-
-msgid "Select directory to import images from"
-msgstr "Zvolte adresář, ze kterého chcete importovat obrázky"
-
-msgid "From existing image layer"
-msgstr "Z existující vrstvy obrázků"
-
-msgid "Import exception"
-msgstr "Výjimka z importu"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Nepodařilo se importovat obrázek ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Nepodařilo se importovat adresář ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr "Značka s klíčem <i>{0}</i> je již na vybraném objektu OSM přítomna."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Opravdu chcete nahradit současnou hodnotu <i>{0}</i> novou hodnotou "
-"<i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Konflikt značek"
-
-msgid "Key copied to clipboard"
-msgstr "Klíč zkopírován do schránky"
-
-msgid ""
-"The Mapillary plugin now uses a separate panel to display extra information "
-"(like the image key) and actions for the currently selected Mapillary image "
-"(like viewing it in a browser)."
-msgstr ""
-"Doplněk Mapillary nyní používá zvláštní panel pro zobrazení dodatečných "
-"informací (jako třeba klíče image) a akcí s aktuálně zvoleným obrázkem z "
-"Mapillary (jako třeba zobrazení v prohlížeči)."
-
-msgid ""
-"It can be activated by clicking the left button at the bottom of this "
-"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
-"Lze ho aktivovat kliknutím levým tlačítkem na spodek této zprávy nebo "
-"tlačítkem na panelu nástrojů vlevo, které má stejnou ikonu."
-
-msgid "I got it, close this."
-msgstr "Rozumím, zavřít."
-
-msgid "Image info"
-msgstr "Informace o obrázku"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr "Zobrazí podrobné informace o aktuálně zvoleném obrázku Mapillary."
-
-msgid "Show detections on top of image"
-msgstr "Zobrazit detekce na vrcholu snímku"
-
-msgid "View in browser"
-msgstr "Zobrazit v prohlížeči"
-
-msgid "Copy key"
-msgstr "Kopírovat klíč"
-
-msgid "Add Mapillary tag"
-msgstr "Přidat značku Mapillary"
-
-msgid "Image detections"
-msgstr "Detekce obrázků"
-
-msgid "Image actions"
-msgstr "Akce s obrázkem"
-
-msgid "Image key"
-msgstr "Klíč obrázku"
-
-msgid "Sequence key"
-msgstr "Klíč sekvence"
-
-msgid "{0} detections"
-msgstr "{0} detekcí"
-
-msgid "image has no key"
-msgstr "obrázek nemá žádný klíč"
-
-msgid "unknown user"
-msgstr "neznámý uživatel"
-
-msgid "sequence has no key"
-msgstr "sekvence nemá žádný klíč"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Nemohu otevřít URL {0} v prohlížeči"
-
-msgid "Downloading map objects…"
-msgstr "Stahuji objekty mapy..."
-
-msgid "All map objects loaded."
-msgstr "Všechny objekty mapy načteny."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-"Příliš mnoho mapových objektů, zvětšte přiblížení, abyste viděli všechny."
-
-msgid "Downloading map objects failed!"
-msgstr "Stažení objektů mapy selhalo!"
-
-msgid "Mapillary objects"
-msgstr "Objekty Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Zobrazí objekty detekované Mapillary z jejich fotografií ulic"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Smazán {0} obrázek"
-msgstr[1] "Smazány {0} obrázky"
-msgstr[2] "Smazáno {0} obrázků"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Importován {0} obrázek"
-msgstr[1] "Importovány {0} obrázky"
-msgstr[2] "Importováno {0} obrázků"
-
-msgid "2 images joined"
-msgstr "2 obrázky sloučeny"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Posunut {0} obrázek"
-msgstr[1] "Posunuty {0} obrázky"
-msgstr[2] "Posunuto {0} obrázků"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Otočen {0} obrázek"
-msgstr[1] "Otočeny {0} obrázky"
-msgstr[2] "Otočeno {0} obrázků"
-
-msgid "2 images unjoined"
-msgstr "2 obrázky rozděleny"
-
-msgid "Could not read from URL {0}!"
-msgstr "Nelze číst z URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Nelze načíst objekty mapy z URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "vše ve viditelné oblasti"
-
-msgid "areas with downloaded OSM-data"
-msgstr "oblasti se staženými daty OSM"
-
-msgid "only when manually requested"
-msgstr "pouze pokud je ručně požadováno"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"Do vrstvy Mapillary se již nenačítají obrázky, protože požadovaná oblast je "
-"příliš velká!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"Chcete-li tento problém vyřešit, přibližte obraz a načtěte menší oblast mapy."
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-"Chcete-li tento problém vyřešit, přepněte na režim stahování ''{0}'' a "
-"načtěte obrázky Mapillary z menší části mapy."
-
-msgid "Downloading"
-msgstr "Stahuji"
-
-msgid "Select mode"
-msgstr "Výběr režimu"
-
-msgid "Mapillary login"
-msgstr "Přihlášení Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Přihlášení úspěšné, návrat do JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Podporované formáty obrázků (JPG a PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Stáhnout obrázky z Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Celkem obrázků z Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Odesílání sady změn Mapillary"
-
-msgid "No images found"
-msgstr "Nebyly nalezeny žádné obrázky"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Úspěšně jste nahrál {0} obrázky na mapillary.com"
-
-msgid "Finished upload"
-msgstr "Nahrávání na server dokončeno"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "Nejste přihlášeni, prosím, přihlaste se k Mapillary v předvolbách"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Nepřihlášeno k Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Nahrávám na server: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31336,6 +30872,110 @@ msgstr "Pro tento objekt nebyla nalezena žádná adresa."
 msgid "An unexpected exception occurred:"
 msgstr "Došlo k neočekávané výjimce:"
 
+msgid "Auto Tools"
+msgstr ""
+
+msgid "Combine LA buildings"
+msgstr ""
+
+msgid "Combine LA import buildings"
+msgstr ""
+
+msgid "AutoTools:CLAbuildings"
+msgstr ""
+
+msgid "revert tags"
+msgstr ""
+
+msgid "to {0} primitive"
+msgid_plural "to {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "ReplaceBuilding"
+msgstr ""
+
+msgid "Replace imported buildings"
+msgstr ""
+
+msgid "AutoTools:ReplaceBuilding"
+msgstr ""
+
+msgid "Select at least one building."
+msgstr ""
+
+msgid "Select only buildings without nodes."
+msgstr ""
+
+msgid "Select two buildings."
+msgstr ""
+
+msgid "There's no building to replace"
+msgstr ""
+
+msgid "Select maximum two buildings."
+msgstr ""
+
+msgid "Cannot replace relations."
+msgstr ""
+
+msgid ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+msgstr ""
+"Tento nástroj může pouze nahradit uzel, rozšířit jej na cestu nebo "
+"multipolygon, nebo nahradit cestu jinou cestou."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Uzel náleží do cesty (cest), nelze ho nahradit."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "Relace není multipolygon, takže ji nelze použít jako náhradu."
+
+msgid "Replace geometry for node {0}"
+msgstr "Nahradit geometrii bodu {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Prosím, vyberte jednu cestu, která existuje v databázi a jednu novou cestu "
+"se správnou geometrií."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Cesty musí být kompletně v stažené oblasti."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Cesta, která má být nahrazena, nemůže obsahovat žádné uzly s vlastností "
+"členství v relaci, pokud nepatří oběma cestám."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr "Překročen limit iterací pro robustní metodu, použita zjednodušená."
+
+msgid "Replace geometry for way {0}"
+msgstr "Nahradit geometrii cesty {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Je přidáno příliš mnoho cest: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Zobecnění budov"
 
@@ -31371,9 +31011,30 @@ msgstr "Značky budov:"
 msgid "Cannot place building outside of the world."
 msgstr "Nelze umístit budovy mimo svět."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Vytvořit budovu"
 
+msgid "Add address for building"
+msgstr ""
+
+msgid "Set building shape to circle"
+msgstr ""
+
+msgid "Set buildings shape to circle"
+msgstr ""
+
+msgid "Data: {0}"
+msgstr ""
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Nastavit rozměry budov"
 
@@ -31386,8 +31047,17 @@ msgstr "Automaticky vybírat budovu"
 msgid "Use address nodes under buildings"
 msgstr "Použít uzly s adresou ležící pod budovami"
 
-msgid "Buildings width:"
-msgstr "Šířka budov:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Délka kroku:"
@@ -32131,6 +31801,18 @@ msgstr "Smazat vybrané schéma ze seznamu."
 msgid "Color Schemes"
 msgstr "Schémata barev"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Přerušit úpravy značek a zavřít dialog"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Použít upravené značky a zavřít dialog"
+
 msgid "Conflation"
 msgstr "Sloučení"
 
@@ -32651,6 +32333,9 @@ msgstr "Otevřít panel GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Zvětšit, aby byly vidět zprávy"
 
+msgid "Login"
+msgstr "Přihlásit se"
+
 msgid "Enable autologin"
 msgstr "Přihlašovat automaticky"
 
@@ -32684,24 +32369,15 @@ msgstr "Soukromý rozhovor"
 msgid "Close tab"
 msgstr "Zavřít záložku"
 
+msgid "Logout"
+msgstr "Odhlásit se"
+
 msgid "Clear log"
 msgstr "Vymazat záznam"
 
 msgid "Show users on map"
 msgstr "Ukazovat uživatele na mapě"
 
-msgid "GeoJSON file"
-msgstr "Soubor GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Načítám soubor json..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Datové vrstvy z GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Chyba při nahrávání souboru geojson {0}"
-
 msgid "Position only"
 msgstr "Jen pozice"
 
@@ -32792,6 +32468,9 @@ msgstr "Globalsat Import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importovat data z Globalsat Datalogger DG100 do GPX vrstvy."
 
+msgid "Import"
+msgstr "Import"
+
 msgid "GPS Blams"
 msgstr "GPS Blam"
 
@@ -33539,8 +33218,28 @@ msgstr "Typ stavby:"
 msgid "Offset into background:"
 msgstr "Ofset do pozadí:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Pomocník mapování vnitřních prostor"
+msgid "ConfirmObjectDrawing"
+msgstr "PotvrditVykresleníObjektu"
+
+msgid "ConfirmMultipolygonSelection"
+msgstr "PotvrditVýběrMultipolygonu"
+
+msgid "Please insert a value."
+msgstr "Vložte, prosím, hodnotu."
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+"Stiskněte, prosím, nejdříve mezerník, abyste přidali do relace ''outer'' "
+"objekt."
+
+msgid "Relation-Error"
+msgstr "Chyba relace"
+
+msgid "No data selected."
+msgstr "Nejsou zvolena žádná data."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr "Není zvolena žádná relace nebo člen s rolí ''outer''."
 
 msgid "POWER"
 msgstr "NAPÁJENÍ"
@@ -33572,36 +33271,104 @@ msgstr "Nastaví značku ref, když je vybrán objekt místnost."
 msgid "Apply Tags"
 msgstr "Aplikovat značky"
 
-msgid "Fitting"
-msgstr "Přizpůsobení"
+msgid "Add a new level"
+msgstr "Přidat nové patro"
 
 msgid ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
+"<html> Please insert the new level number you want to add.<br>  <i>Info</i>: "
+"<br> If the OK button got pressed you will switch to the drawing "
+"action.<br>To finish the new object please press the spacebar. The new "
+"level<br>will be tagged automatically. </html>"
 msgstr ""
-"<html>Prosím, začněte přizpůsobovat vaše plány budovy.<br>Chcete-li to "
-"udělat, použijte doplněk PicLayer, který můžete nainstalovat<br>za pomocí "
-"správce doplňků JOSM.</html>"
-
-msgid "Level Selection"
-msgstr "Výběr patra"
+"<html> Vložte, prosím, číslo nového patra, které chcete přidat.<br>  "
+"<i>Informace</i>: <br> Pokud stisknete tlačítko OK, přepne se do režimu "
+"kreslení.<br>Po dokončení nového objektu stiskněte, prosím, mezerník. Nové "
+"patro<br>bude automaticky označeno značkami. </html>"
 
-msgid "Lowest Level"
-msgstr "Nejnižší patro"
+msgid "level number:"
+msgstr "číslo patra:"
 
-msgid "The lowest level of your building."
-msgstr "Nejnižší patro vaší budovy."
-
-msgid "Highest Level"
-msgstr "Nejvyšší patro"
+msgid "Example: ''2'' or ''3''"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Nejvyšší patro vaší budovy."
+msgid "Indoor Mapping Helper"
+msgstr "Pomocník mapování vnitřních prostor"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Panel nástrojů pro mapování vnitřních prostor"
 
+msgid "Insert level"
+msgstr "Vložit patro"
+
+msgid "Add a new level to layer."
+msgstr "Přidá do vrstvy nové patro."
+
+msgid "<html><b>?</strong></b>"
+msgstr "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Zobrazit prohlížeč nápovědy."
+
+msgid "Level name"
+msgstr "Název patra"
+
+msgid "Sets optional name tag for a level."
+msgstr "Nastaví volitelnou značku se jménem patra."
+
+msgid "Working level: NONE"
+msgstr "Pracovní patro: ŽÁDNÉ"
+
+msgid "Shows the current working level."
+msgstr "Zobrází aktuální pracovní patro."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Deaktivovat automatické značení pater."
+
+msgid "Sets the name tag."
+msgstr "Nastaví značku se jménem."
+
+msgid "Sets the referance tag."
+msgstr "Nastaví značku reference."
+
+msgid "Repeat on"
+msgstr "Opakovat ve"
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+"Nastaví značku opakování, jsou-li vybrány objekty silnic. Značte, prosím, "
+"takto: -3-4 nebi -2--3 nebo 5-6."
+
+msgid "OUTER"
+msgstr "VNĚJŠÍ"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Nástroj pro vytváření multipolygonu z rolí: outer. Pro dokončení stiskněte "
+"mezerník."
+
+msgid "INNER"
+msgstr "VNITŘNÍ"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Nástroj pro vytváření multipolygonu z rolí: inner. Pro dokončení stiskněte "
+"mezerník. Pro přidání do relace zvolte ''outer'' a stiskněte Enter."
+
+msgid "Deactivate multipolygon function."
+msgstr "Deaktivovat funkci multipolygonu."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Přidá zvolení značky a/nebo relace k objektu."
+
+msgid "Working level: {0}"
+msgstr "Pracovní patro: {0}"
+
 msgid "InfoMode"
 msgstr "InfoMode"
 
@@ -34771,6 +34538,27 @@ msgstr "Neznámá přípona souboru: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Parsování souboru \"{0}\" selhalo"
 
+msgid "Copy: "
+msgstr ""
+
+msgid "Open in browser "
+msgstr ""
+
+msgid "OpenStreetMap obj info"
+msgstr ""
+
+msgid "Open OpenStreetMap obj info window"
+msgstr ""
+
+msgid "Object Id"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Images"
+msgstr ""
+
 msgid "Osmarender"
 msgstr "Osmarender"
 
@@ -35049,6 +34837,7 @@ msgstr "Nelze zpracovat soubor ''{0}'':"
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Zapisuji informace o poloze do obrázkových souborů... Odhadem zbývá: {0}"
 
 msgid "File could not be deleted!"
 msgstr "Soubor nemohl být smazán!"
@@ -35108,6 +34897,9 @@ msgstr "Upravit údaje GPS fotografie"
 msgid "Please select an image first."
 msgstr "Nejdříve vyberte obrázek."
 
+msgid "No image selected"
+msgstr "Nebyl vybrán žádný obrázek"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Prázdné hodnoty vymažou odpovídající pole.)"
 
@@ -35870,6 +35662,9 @@ msgstr "implicitní"
 msgid "State"
 msgstr "Stav"
 
+msgid "pending"
+msgstr "čekající"
+
 msgid "[incomplete]"
 msgstr "[nekompletní]"
 
@@ -36288,12 +36083,6 @@ msgstr "Nová hodnota pro {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Chybí předvolba ''{0}''. Nelze inicializovat SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Nepodařilo se navázat spojení s API {0}"
-
-msgid "Proxy Authentication Required"
-msgstr "Požadována autentizace proxy"
-
 msgid ""
 "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
 "is stored in plain text in the JOSM preferences file. </p></body></html>"
@@ -36658,12 +36447,6 @@ msgstr "Doplněk JOSM Tag Editor"
 msgid "Presets"
 msgstr "Předvolby"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Přerušit úpravy značek a zavřít dialog"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Použít upravené značky a zavřít dialog"
-
 msgid "Highlight"
 msgstr "Výška"
 
@@ -38374,45 +38157,6 @@ msgstr ""
 "Tento nástroj nahrazuje geometrii jednoho objektu geometrií jiného, "
 "potřebuje tedy, aby byly vybrány právě dva objekty."
 
-msgid ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-msgstr ""
-"Tento nástroj může pouze nahradit uzel, rozšířit jej na cestu nebo "
-"multipolygon, nebo nahradit cestu jinou cestou."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Uzel náleží do cesty (cest), nelze ho nahradit."
-
-msgid "Replace geometry for node {0}"
-msgstr "Nahradit geometrii bodu {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "Relace není multipolygon, takže ji nelze použít jako náhradu."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Prosím, vyberte jednu cestu, která existuje v databázi a jednu novou cestu "
-"se správnou geometrií."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Cesty musí být kompletně v stažené oblasti."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Cesta, která má být nahrazena, nemůže obsahovat žádné uzly s vlastností "
-"členství v relaci, pokud nepatří oběma cestám."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr "Překročen limit iterací pro robustní metodu, použita zjednodušená."
-
-msgid "Replace geometry for way {0}"
-msgstr "Nahradit geometrii cesty {0}"
-
 msgid "Replace Membership"
 msgstr "Nahradit členství"
 
@@ -38490,9 +38234,6 @@ msgstr "Vybrat prostřední uzly"
 msgid "Please select two nodes connected by way!"
 msgstr "Prosím, vyberte dva uzly spojené cestou!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Je přidáno příliš mnoho cest: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Vše uvnitř [testování]"
 
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 2dc6849..4f4c50c 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-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-07-17 21:45+0000\n"
 "Last-Translator: iggy23 <Unknown>\n"
 "Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:06+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:07+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: cy\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -948,7 +948,7 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2246,12 +2246,12 @@ msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"first member(s), successively continuing to the last."
+"first member, successively continuing to the last."
 msgstr ""
 
 msgid ""
 "Flatten this relation to a single gpx track recursively, starting with the "
-"last member(s), successively continuing to the first."
+"last member, successively continuing to the first."
 msgstr ""
 
 msgid "Selected Relations"
@@ -8247,9 +8247,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr ""
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9702,6 +9699,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12744,9 +12744,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14439,6 +14436,10 @@ msgstr ""
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14448,10 +14449,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16275,10 +16272,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17764,6 +17757,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17785,6 +17781,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20438,6 +20437,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23509,6 +23514,33 @@ msgstr ""
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 
+msgid "OpenRailwayMap"
+msgstr ""
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr ""
+
+msgid "OpenInfraMap Telecoms"
+msgstr ""
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Power"
+msgstr ""
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
+msgid "OpenInfraMap Petroleum"
+msgstr ""
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
 
@@ -23590,7 +23622,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23605,7 +23637,7 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr ""
 
 msgid ""
@@ -23613,21 +23645,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Bunger Hills"
+msgstr ""
+
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
+msgstr ""
+
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
+msgstr ""
+
+msgid ""
+"Up-to-date late season image - not ice minimum, be careful with "
+"distinguishing sea ice from ice shelves. (true color)"
+msgstr ""
+
+msgid "imagico.de: Enderby Land and Kemp Coast"
 msgstr ""
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 
+msgid "imagico.de: Larsen C ice shelf after calving"
+msgstr ""
+
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
+msgstr ""
+
 msgid "IGN topographical map (TMS)"
 msgstr ""
 
@@ -23766,13 +23820,13 @@ msgstr ""
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
+msgid "imagico.de: Bahía Blanca (low tide)"
 msgstr ""
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
+msgid "imagico.de: Bahía Blanca (high tide)"
 msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
@@ -23805,14 +23859,14 @@ msgstr ""
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: Heard Island coast"
 msgstr ""
 
 msgid ""
@@ -23878,7 +23932,7 @@ msgstr ""
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -23965,13 +24019,13 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr ""
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -24139,34 +24193,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -24174,7 +24227,7 @@ msgid ""
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -24222,7 +24275,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24230,7 +24283,7 @@ msgid ""
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -24399,8 +24452,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -24408,9 +24460,7 @@ msgid ""
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
 
 msgid ""
@@ -24418,10 +24468,10 @@ msgid ""
 "and shoals (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "imagico.de: North Sea Coast 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
 msgstr ""
 
 msgid "Saxony latest aerial imagery"
@@ -24454,57 +24504,52 @@ msgstr ""
 msgid "Munich latest aerial imagery 60cm"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
+msgid "imagico.de: Kangerlussuaq Autumn"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
+msgid "imagico.de: Kangerlussuaq Spring"
 msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
+msgid "imagico.de: 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"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
 msgstr ""
 
 msgid ""
@@ -24512,13 +24557,13 @@ msgid ""
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgid "imagico.de: 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"
+msgid "imagico.de: Northern Greenland ASTER"
 msgstr ""
 
 msgid ""
@@ -24586,13 +24631,13 @@ msgstr ""
 msgid "Hillshade Hungary"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr ""
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr ""
 
 msgid ""
@@ -24600,7 +24645,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24608,7 +24653,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24616,19 +24661,19 @@ msgid ""
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
+msgid "imagico.de: Sudirman Range 2016"
 msgstr ""
 
 msgid ""
@@ -24733,13 +24778,13 @@ msgstr ""
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
+msgid "imagico.de: Aral Sea (low water level)"
 msgstr ""
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
+msgid "imagico.de: Aral Sea (high water level)"
 msgstr ""
 
 msgid ""
@@ -24747,7 +24792,7 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -24841,13 +24886,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr ""
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -24935,6 +24973,20 @@ msgid ""
 "shelf"
 msgstr ""
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr ""
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
 
@@ -24943,6 +24995,30 @@ msgid ""
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr ""
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+
+msgid "SSB Urban Areas overlay"
+msgstr ""
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -24950,13 +25026,13 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgid "imagico.de: Svalbard mosaic"
 msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr ""
 
 msgid ""
@@ -24970,7 +25046,7 @@ msgstr ""
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -24978,29 +25054,28 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr ""
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr ""
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -25069,7 +25144,10 @@ msgstr ""
 msgid "Łódź: Buildings"
 msgstr ""
 
-msgid "Łódź: Orthophotomap (aerial image)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
 msgstr ""
 
 msgid "Powiat dębicki: Buildings"
@@ -25102,6 +25180,12 @@ msgstr ""
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr ""
 
@@ -25150,33 +25234,31 @@ msgstr ""
 msgid "ScanEx SPOT"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgid "imagico.de: 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"
+msgid "imagico.de: 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 Dvina delta at low tide"
+msgid "imagico.de: Northern Dvina delta at low tide"
 msgstr ""
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
 msgstr ""
 
 msgid ""
@@ -25184,7 +25266,7 @@ msgid ""
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr ""
 
 msgid "Recent image showing newest features (true color)"
@@ -25230,25 +25312,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: 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"
+msgid "imagico.de: Scott Island"
 msgstr ""
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr ""
 
 msgid "Catastro Spain"
@@ -25272,7 +25354,7 @@ msgstr ""
 msgid "GRAFCAN Express - Canary Islands"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25368,7 +25450,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgid "imagico.de: Central Alps in late September 2016"
 msgstr ""
 
 msgid ""
@@ -25376,6 +25458,13 @@ msgid ""
 "altitudes (true color)"
 msgstr ""
 
+msgid "imagico.de: Western Alps autumn colors 2017"
+msgstr ""
+
+msgid ""
+"Autumn colors in the Alps, Jura and southwestern Germany  (true color)"
+msgstr ""
+
 msgid "Taiwan e-Map Open Data"
 msgstr ""
 
@@ -25394,7 +25483,7 @@ msgstr ""
 msgid "NLSC Open Data WMTS"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25456,7 +25545,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -25464,13 +25553,13 @@ msgid ""
 "color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
 msgstr ""
 
 msgid "Recent image from after the eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
 msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
@@ -25557,7 +25646,14 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr ""
 
 msgid ""
@@ -25565,7 +25661,7 @@ msgid ""
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -25580,6 +25676,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26571,32 +26673,28 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 
-msgid ""
-"{0}: meters is default; period is separator; if units, put space then unit"
+msgid "unusual value of {0}: use . instead of , as decimal separator"
 msgstr ""
 
 msgid ""
-"{0}: tonne is default; period is separator; if units, put space then unit"
-msgstr ""
-
-msgid "unusual {0} format"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
 msgid ""
-"{0}: kilometers is default; period is separator; if units, put space then "
-"unit"
-msgstr ""
-
-msgid "voltage should be in volts with no units/delimiter/spaces"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 
 msgid "{0} must be a numeric value"
@@ -26605,9 +26703,6 @@ msgstr ""
 msgid "{0} must be a positive integer number"
 msgstr ""
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26714,6 +26809,9 @@ msgstr ""
 msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr ""
 
@@ -26757,6 +26855,9 @@ msgid ""
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
 
+msgid "Automatic tools to help on common issues"
+msgstr ""
+
 msgid ""
 "Allows the user to correct angle of buildings to 90 degrees, and aligns all "
 "loaded buildings to nearest road."
@@ -26790,6 +26891,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26837,6 +26941,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -27002,6 +27111,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -27791,550 +27903,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr ""
-
-msgid "Mapillary layer"
-msgstr ""
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr ""
-
-msgid "{0} downloaded images"
-msgstr ""
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr ""
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr ""
-
-msgid "Download Mapillary images in current view"
-msgstr ""
-
-msgid "Export pictures"
-msgstr ""
-
-msgid "Export Mapillary pictures"
-msgstr ""
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr ""
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr ""
-
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr ""
-
-msgid "approved"
-msgstr ""
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr ""
-
-msgid "Zoom to selected image"
-msgstr ""
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
-
-msgid "Current Mapillary changeset"
-msgstr ""
-
-msgid "Open Mapillary changeset dialog"
-msgstr ""
-
-msgid "Mapillary changeset"
-msgstr ""
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr ""
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr ""
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr ""
-
-msgid "Give way"
-msgstr ""
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr ""
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr ""
-
-msgid "No turn"
-msgstr ""
-
-msgid "Years"
-msgstr ""
-
-msgid "Months"
-msgstr ""
-
-msgid "Days"
-msgstr ""
-
-msgid "Imported images"
-msgstr ""
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr ""
-
-msgid "Downloaded images"
-msgstr ""
-
-msgid "Only images with signs"
-msgstr ""
-
-msgid "Choose signs"
-msgstr ""
-
-msgid "Mapillary history"
-msgstr ""
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr ""
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr ""
-
-msgid "Jump to red"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
-
-msgid "Jump to blue"
-msgstr ""
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
-
-msgid "Stops the walk."
-msgstr ""
-
-msgid "Play"
-msgstr ""
-
-msgid "Continues with the paused walk."
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr ""
-
-msgid "Use 24 hour format"
-msgstr ""
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr ""
-
-msgid "Cut off sequences at download bounds"
-msgstr ""
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-
-msgid "Download mode"
-msgstr ""
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr ""
-
-msgid "You are currently not logged in."
-msgstr ""
-
-msgid "Login"
-msgstr ""
-
-msgid "Logout"
-msgstr ""
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr ""
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follo